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

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

diff --git a/actions/deleteaccount.php b/actions/deleteaccount.php
index dd587d04453b9c2370ea6db5d7f26baca6c7770a..cd7f6578fcbb5eec2afa2c30afeaa64841edfb93 100644 (file)
--- a/actions/deleteaccount.php
+++ b/actions/deleteaccount.php
@@ -108,7 +108,7 @@ class DeleteaccountAction extends Action
      *
      * @return boolean is read only action?
      */
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return false;
     }
@@ -161,7 +161,7 @@ class DeleteaccountAction extends Action
         if ($this->trimmed('iamsure') != $iamsure ) {
             // TRANS: Notification for user about the text that must be input to be able to delete a user account.
             // TRANS: %s is the text that needs to be input.
-            $this->_error = sprintf(_('You must write  "%s" exactly in the box.', $iamsure));
+            $this->_error = sprintf(_('You must write "%s" exactly in the box.'), $iamsure);
             $this->showPage();
             return;
         }
@@ -320,6 +320,6 @@ class DeleteAccountForm extends Form
                            'submit',
                            null,
                            // TRANS: Button title for user account deletion.
-                           _('Permanently delete your account'));
+                           _('Permanently delete your account.'));
     }
 }