From: sarven <csarven@plantard.controlezvous.ca>
Date: Thu, 15 Jan 2009 23:10:44 +0000 (+0000)
Subject: Merge branch 'uiredesign' of ../evan into uiredesign
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=39b5957068126be3d0fbe93769daf6038a53f4d4;p=quix0rs-gnu-social.git

Merge branch 'uiredesign' of ../evan into uiredesign
---

39b5957068126be3d0fbe93769daf6038a53f4d4
diff --cc actions/login.php
index 5226458fb0,cd337bd395..7ae1ed41dd
--- a/actions/login.php
+++ b/actions/login.php
@@@ -120,9 -120,11 +120,9 @@@ class LoginAction extends Actio
          if ($this->error) {
              $this->element('p', 'error', $this->error);
          } else {
-             $instr = $this->get_instructions();
+             $instr = $this->getInstructions();
              $output = common_markup_to_html($instr);
 -	    $this->elementStart('div', 'instructions');
              $this->raw($output);
 -            $this->elementEnd('div');
          }
      }