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

1 files changed, 2 insertions, 1 deletions

diff --git a/actions/login.php b/actions/login.php
index 7ae1ed41d..23ab16676 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 class LoginAction extends Action
 {
-
+    var $error = null;
+    
     function isReadOnly()
     {
         return true;