Avoid having to check for notices without rendered copies in upgrade.php

[quix0rs-gnu-social.git] / lib / formaction.php

diff --git a/lib/formaction.php b/lib/formaction.php
index 0cc455e9681df7462a7d804ef819f7094e068d5b..7d74fc47130eaf20f6bb23b116e21eab8f9d6664 100644 (file)
--- a/lib/formaction.php
+++ b/lib/formaction.php
@@ -50,7 +50,7 @@ class FormAction extends ManagedAction
     protected function prepare(array $args=array()) {
         parent::prepare($args);
 
-        $this->form = $this->form ?: $this->action;
+        $this->form = $this->form ?: ucfirst($this->action);
         $this->args['form'] = $this->form;
 
         $this->type = !is_null($this->type) ? $this->type : $this->trimmed('type');
@@ -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;
     }