diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2009-02-12 16:05:37 -0500 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2009-02-12 16:05:37 -0500 |
commit | 3b5fd8fb6bbfa95efe3294ea77ae809dab071f99 (patch) | |
tree | cde49da4754faa0892088cb6cb14831ed6339ff0 /actions/register.php | |
parent | b09eb06dae77be27e56d1573de0de7d393950ce5 (diff) |
Revert "Code to handle PEAR_Errors raised by DB_DataObject that are bubbling"
This reverts commit 9f035e2847e0d119ca3d70e02df6f4fa73ca64c3.
It's a lot of complicated stuff, and the global handler probably does
fine.
Diffstat (limited to 'actions/register.php')
-rw-r--r-- | actions/register.php | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/actions/register.php b/actions/register.php index 853bd0cf6..5d7a8ce69 100644 --- a/actions/register.php +++ b/actions/register.php @@ -223,31 +223,10 @@ class RegisterAction extends Action */ function nicknameExists($nickname) - { + { $user = User::staticGet('nickname', $nickname); return ($user !== false); } - - /** - * Check old fashioned PEAR_Error msgs coming from DB_DataObject - * - * In this case nickname and email don't exist in the DB yet, - * so DB_DataObject throws an error. Overrided from Action. - * - * @param PEAR_Error - * - * @return nothing - */ - - function checkDB_DataObjectError($error) { - if ($error->getCode() == DB_DATAOBJECT_ERROR_NODATA) { - - // Do nothing. - - } else { - parent::checkDB_DataObjectError($error); - } - } /** * Does the given email address already exist? |