X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FEmailRegistration%2Factions%2Femailregister.php;h=aa7f4d6ab6fc145ca1f29c6eeb6d63fa80180d5f;hb=c00491cd7a29a9ef16d6e6bfa54505d4c9a522fe;hp=5eaf84ad5402859ea3916a8b311459991bee9993;hpb=de55d8f83bb2ecf9461510768fe7147aec592055;p=quix0rs-gnu-social.git

diff --git a/plugins/EmailRegistration/actions/emailregister.php b/plugins/EmailRegistration/actions/emailregister.php
index 5eaf84ad54..aa7f4d6ab6 100644
--- 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.
         }
     }