summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Cochrane <mikec@mikenz.geek.nz>2008-07-12 08:39:42 -0400
committerMike Cochrane <mikec@mikenz.geek.nz>2008-07-12 08:39:42 -0400
commit8ffe49b595de457a0e9329a274060e827734edba (patch)
tree5b811ed371ff6529bc690d8f39ca30a02cefeb69
parent16f0f6589b498c12a7872eebb134a3b776339837 (diff)
Error I made merging a diff
darcs-hash:20080712123942-533db-21fa41076dd7b57935f49462423f247ccbb01e8f.gz
-rw-r--r--actions/register.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/actions/register.php b/actions/register.php
index 37e787c9d..aacc4fa7b 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -63,7 +63,7 @@ class RegisterAction extends Action {
$this->show_form(_('Email address already exists.'));
} else if ($password != $confirm) {
$this->show_form(_('Passwords don\'t match.'));
- } else {
+ } else if ($this->register_user($nickname, $password, $email)) {
$user = $this->register_user($nickname, $password, $email);
if (!$user) {
$this->show_form(_('Invalid username or password.'));