From f4a06719b1372c43d0b4a01493a93e16ff0ffbb5 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 4 May 2011 16:12:49 -0700
Subject: [PATCH] Fix WSOD with EmailRegistration plugin's confirmation form

---
 plugins/EmailRegistration/emailregister.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/EmailRegistration/emailregister.php b/plugins/EmailRegistration/emailregister.php
index 2d32b40456..062b054ad7 100644
--- a/plugins/EmailRegistration/emailregister.php
+++ b/plugins/EmailRegistration/emailregister.php
@@ -252,7 +252,6 @@ class EmailregisterAction extends Action
             if (!$this->tos) {
                 // TRANS: Error text when trying to register without agreeing to the terms.
                 $this->error = _m('You must accept the terms of service and privacy policy to register.');
-                return;
             } else if (empty($this->password1)) {
                 // TRANS: Error text when trying to register without a password.
                 $this->error = _m('You must set a password');
@@ -266,7 +265,7 @@ class EmailregisterAction extends Action
 
             if (!empty($this->error)) {
                 $nickname = $this->nicknameFromEmail($email);
-                $this->form = new ConfirmRegistrationForm($this, $nickname, $this->email, $this->code);
+                $this->form = new ConfirmRegistrationForm($this, $nickname, $email, $this->code);
                 $this->showPage();
                 return;
             }
@@ -281,7 +280,7 @@ class EmailregisterAction extends Action
             } catch (ClientException $e) {
                 $this->error = $e->getMessage();
                 $nickname = $this->nicknameFromEmail($email);
-                $this->form = new ConfirmRegistrationForm($this, $nickname, $this->email, $this->code);
+                $this->form = new ConfirmRegistrationForm($this, $nickname, $email, $this->code);
                 $this->showPage();
                 return;
             }