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 614519d47430590f0b5b499de6155ef842edce3d..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;
     }
@@ -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.'));
     }
 }