Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/actions/restoreaccount.php b/actions/restoreaccount.php
index 22f0a8e5da5dc01c24e38cde1d3c10edd0f74969..6b6cd64f9412dcb7b7dd660a32033dae279afdfe 100644 (file)
--- a/actions/restoreaccount.php
+++ b/actions/restoreaccount.php
@@ -258,7 +258,7 @@ class RestoreaccountAction extends Action
      *
      * @return boolean is read only action?
      */
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return false;
     }
@@ -339,7 +339,7 @@ class RestoreAccountForm extends Form
         $this->out->elementStart('p', 'instructions');
 
         // TRANS: Form instructions for feed restore.
-        $this->out->raw(_('You can upload a backed-up stream in '.
+        $this->out->raw(_('You can upload a backed-up timeline in '.
                           '<a href="http://activitystrea.ms/">Activity Streams</a> format.'));
 
         $this->out->elementEnd('p');