Merge branch 'master' of gitorious.org:social/mainline

[quix0rs-gnu-social.git] / plugins / EmailRegistration / actions / emailregister.php

diff --git a/plugins/EmailRegistration/actions/emailregister.php b/plugins/EmailRegistration/actions/emailregister.php
index 5eaf84ad5402859ea3916a8b311459991bee9993..3ad9c63f13ee814fc0ce3fd72105be94c25b909e 100644 (file)
--- a/plugins/EmailRegistration/actions/emailregister.php
+++ b/plugins/EmailRegistration/actions/emailregister.php
@@ -191,7 +191,6 @@ class EmailregisterAction extends Action
 
         if (!empty($cur)) {
             common_redirect(common_local_url('all', array('nickname' => $cur->nickname)));
-            return;
         }
 
         switch ($this->state) {
@@ -332,9 +331,9 @@ class EmailregisterAction extends Action
         }
 
         if (Event::handle('StartRegisterSuccess', array($this))) {
-            common_redirect(common_local_url('doc', array('title' => 'welcome')),
-                            303);
             Event::handle('EndRegisterSuccess', array($this));
+            common_redirect(common_local_url('doc', array('title' => 'welcome')), 303);
+            // common_redirect exits, so we can't run the event _after_ it of course.
         }
     }
 
@@ -395,7 +394,7 @@ class EmailregisterAction extends Action
      *
      * @return boolean is read only action?
      */
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return false;
     }