summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-02-11 21:41:56 -0800
committerZach Copley <zach@controlyourself.ca>2009-02-11 21:41:56 -0800
commit9f035e2847e0d119ca3d70e02df6f4fa73ca64c3 (patch)
tree518d2eafdea2747ca3210595d34625d03f85c479
parent9d07032334043625a5aa3243d911bdc1c77a7a9c (diff)
Code to handle PEAR_Errors raised by DB_DataObject that are bubbling
up, but are actually expected and can safely be ignored.
-rw-r--r--actions/emailsettings.php22
-rw-r--r--actions/register.php23
-rw-r--r--lib/action.php26
3 files changed, 70 insertions, 1 deletions
diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index b84acb214..c6c983453 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -487,4 +487,26 @@ class EmailsettingsAction extends AccountSettingsAction
return $other->id != $user->id;
}
}
+
+ /**
+ * Check old fashioned PEAR_Error msgs coming from DB_DataObject
+ *
+ * In this case 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);
+ }
+ }
+
}
diff --git a/actions/register.php b/actions/register.php
index 5d7a8ce69..853bd0cf6 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -223,10 +223,31 @@ 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?
diff --git a/lib/action.php b/lib/action.php
index bd38bf79c..e3a8ef62c 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -82,6 +82,17 @@ class Action extends HTMLOutputter // lawsuit
*/
function prepare($argarray)
{
+ // This is for checking PEAR_Errors raised by DB_DataObject.
+ // Setting this to PEAR_ERROR_CALLBACK because setting
+ // to PEAR_ERROR_EXCEPTION does't work to allow PEAR_Errors
+ // to be handled as PHP5 exceptions, and PEAR_ERROR_RETURN
+ // does not cause DB_DataObject to actually return PEAR_Errors
+ // that can be checked with PEAR::isError() -- instead
+ // they just disappear into the ether, and can only be checked for
+ // after the fact. -- Zach
+ PEAR::setErrorHandling(PEAR_ERROR_CALLBACK,
+ array($this, "checkDB_DataObjectError"));
+
$this->args =& common_copy_args($argarray);
return true;
}
@@ -845,6 +856,21 @@ class Action extends HTMLOutputter // lawsuit
}
/**
+ * Check old fashioned PEAR_Error msgs coming from DB_DataObject
+ *
+ * Logs the DB_DataObject error. Override to do something else.
+ *
+ * @param PEAR_Error
+ *
+ * @return nothing
+ */
+
+ function checkDB_DataObjectError($error) {
+ common_log(LOG_ERR, $error->getMessage());
+ // XXX: throw an exception here? --Zach
+ }
+
+ /**
* Returns the current URL
*
* @return string current URL