FormAction wants getInstructions to be protected

only showInstructions is public

diff --git a/actions/login.php b/actions/login.php
index 10563dc56e03d2deb7941b11200c6539fae2a75a..f9fe71ed40503744562639af8676d8fbcf10fae9 100644 (file)
--- a/actions/login.php
+++ b/actions/login.php
@@ -172,7 +172,7 @@ class LoginAction extends FormAction
      *
      * @return void
      */
-    function getInstructions()
+    protected function getInstructions()
     {
         if (common_logged_in() && !common_is_real_login() &&
             common_get_returnto()) {

diff --git a/actions/newapplication.php b/actions/newapplication.php
index c3e6f2d2449d6fd37c386c73989adcd97be57f00..37bede0d72f3c547a3a4e3eb15bde6253c831d00 100644 (file)
--- a/actions/newapplication.php
+++ b/actions/newapplication.php
@@ -66,7 +66,7 @@ class NewApplicationAction extends FormAction
         return new ApplicationEditForm($this);
     }
 
-    public function getInstructions()
+    protected function getInstructions()
     {
         // TRANS: Form instructions for registering a new application.
         return _('Use this form to register a new application.');

diff --git a/lib/formaction.php b/lib/formaction.php
index 0cc455e9681df7462a7d804ef819f7094e068d5b..5cf05d4a324fede134e48eb9f0024a979f80b6f8 100644 (file)
--- a/lib/formaction.php
+++ b/lib/formaction.php
@@ -92,7 +92,7 @@ class FormAction extends ManagedAction
     /**
      * @return string with instructions to pass into common_markup_to_html()
      */
-    public function getInstructions()
+    protected function getInstructions()
     {
         return null;
     }