Error I made merging a diff

darcs-hash:20080712123942-533db-21fa41076dd7b57935f49462423f247ccbb01e8f.gz
This commit is contained in:
Mike Cochrane 2008-07-12 08:39:42 -04:00
parent 16f0f6589b
commit 8ffe49b595

View File

@ -63,7 +63,7 @@ class RegisterAction extends Action {
$this->show_form(_('Email address already exists.')); $this->show_form(_('Email address already exists.'));
} else if ($password != $confirm) { } else if ($password != $confirm) {
$this->show_form(_('Passwords don\'t match.')); $this->show_form(_('Passwords don\'t match.'));
} else { } else if ($this->register_user($nickname, $password, $email)) {
$user = $this->register_user($nickname, $password, $email); $user = $this->register_user($nickname, $password, $email);
if (!$user) { if (!$user) {
$this->show_form(_('Invalid username or password.')); $this->show_form(_('Invalid username or password.'));