Merge branch 'testing'

[quix0rs-gnu-social.git] / classes / File_redirection.php

diff --git a/classes/File_redirection.php b/classes/File_redirection.php
index b7945699ab03aec4145903109393fd101a3cdb87..08a6e8d8beb56d0ccd75c51b9e58c32f57e6c18a 100644 (file)
--- a/classes/File_redirection.php
+++ b/classes/File_redirection.php
@@ -85,7 +85,7 @@ class File_redirection extends Memcached_DataObject
             $request->setMethod(HTTP_Request2::METHOD_HEAD);
             $response = $request->send();
 
-            if (405 == $response->getCode()) {
+            if (405 == $response->getStatus()) {
                 // Server doesn't support HEAD method? Can this really happen?
                 // We'll try again as a GET and ignore the response data.
                 $request = self::_commonHttp($short_url, $redirs);
@@ -101,16 +101,16 @@ class File_redirection extends Memcached_DataObject
             return self::_redirectWhere_imp($short_url, $response->getRedirectCount() - 1, true);
         }
 
-        $ret = array('code' => $response->getCode()
+        $ret = array('code' => $response->getStatus()
                 , 'redirects' => $response->getRedirectCount()
                 , 'url' => $response->getUrl());
 
         $type = $response->getHeader('Content-Type');
         if ($type) $ret['type'] = $type;
         if ($protected) $ret['protected'] = true;
-        $size = $request->getHeader('Content-Length'); // @fixme bytes?
+        $size = $response->getHeader('Content-Length'); // @fixme bytes?
         if ($size) $ret['size'] = $size;
-        $time = $request->getHeader('Last-Modified');
+        $time = $response->getHeader('Last-Modified');
         if ($time) $ret['time'] = strtotime($time);
         return $ret;
     }