Error I made merging a diff

darcs-hash:20080712123942-533db-21fa41076dd7b57935f49462423f247ccbb01e8f.gz

diff --git a/actions/register.php b/actions/register.php
index 37e787c9d05562fd36f711a32c3c4ba3fe043ee5..aacc4fa7b4e3e532f441d29cfa53d71fce7f45bc 100644 (file)
--- 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.'));