Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

diff --git a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
index e6508adc7eaab554865c57a01e3d43df5a3d9879..b6bd6f7e5fbeae4bc8c47ca44e22652c2e8fd181 100644 (file)
--- a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
+++ b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
@@ -285,4 +285,13 @@ class RequireValidatedEmailPlugin extends Plugin
         }
         return true;
     }
+
+    function onLoginAction($action, &$login)
+    {
+        if ($action == 'confirmfirstemail') {
+            $login = true;
+            return false;
+        }
+        return true;
+    }
 }