Merge remote-tracking branch 'upstream/master'

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

diff --git a/actions/redirecturl.php b/actions/redirecturl.php
index db3784bf31d70b4bb09f9eb816ec107d5225c863..724f46e909fe279c4ea292d6e9f15abfcaf6c7bc 100644 (file)
--- a/actions/redirecturl.php
+++ b/actions/redirecturl.php
@@ -56,10 +56,10 @@ class RedirecturlAction extends ManagedAction
 
     public function showPage()
     {
-        common_redirect($this->file->url, 307);
+        common_redirect($this->file->getUrl(false), 301);
     }
 
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }