From 0a2c51510ca785b5e3564fc0830518527929dc38 Mon Sep 17 00:00:00 2001
From: Mikael Nordfeldth <mmn@hethane.se>
Date: Tue, 10 Mar 2015 21:46:33 +0100
Subject: [PATCH] FormAction wants getInstructions to be protected

only showInstructions is public
---
 actions/login.php          | 2 +-
 actions/newapplication.php | 2 +-
 lib/formaction.php         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/actions/login.php b/actions/login.php
index 10563dc56e..f9fe71ed40 100644
--- 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 c3e6f2d244..37bede0d72 100644
--- 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 0cc455e968..5cf05d4a32 100644
--- 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;
     }