Merge branch 'master' into social-master

[quix0rs-gnu-social.git] / actions / redirecturl.php

diff --git a/actions/redirecturl.php b/actions/redirecturl.php
index 2aca4fe02b95ebe82adf713d85d76ca05a2d6626..62418df21709640c2bc79f56aca461cf7928ae09 100644 (file)
--- a/actions/redirecturl.php
+++ b/actions/redirecturl.php
@@ -70,7 +70,7 @@ class RedirecturlAction extends Action
             throw new ClientException(_('No id parameter.'));
         }
 
-        $this->file = File::staticGet('id', $this->id);
+        $this->file = File::getKV('id', $this->id);
 
         if (empty($this->file)) {
             // TRANS: Client exception thrown when an invalid ID parameter was provided for a file.
@@ -93,7 +93,6 @@ class RedirecturlAction extends Action
     function handle($argarray=null)
     {
         common_redirect($this->file->url, 307);
-        return;
     }
 
     /**
@@ -105,7 +104,7 @@ class RedirecturlAction extends Action
      *
      * @return boolean is read only action?
      */
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }