summaryrefslogtreecommitdiff
path: root/actions/emailsettings.php
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-02-11 23:07:49 -0800
committerZach Copley <zach@controlyourself.ca>2009-02-11 23:07:49 -0800
commit986068d6e7119e17509f228857d55873b34da28f (patch)
tree54cad05a538869185774ecc3bb8caf0772392e71 /actions/emailsettings.php
parent7155cf813de1502e796c0eac1e680289f3552c29 (diff)
parent616bdd43a921b2554d21b80af28ddb0fb6cb3c16 (diff)
Merge branch '0.7.x' into queuehandlers
Diffstat (limited to 'actions/emailsettings.php')
-rw-r--r--actions/emailsettings.php22
1 files changed, 22 insertions, 0 deletions
diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index b84acb214..0a86aa66d 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -487,4 +487,26 @@ class EmailsettingsAction extends AccountSettingsAction
return $other->id != $user->id;
}
}
+
+ /**
+ * Handle 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 handleError($error) {
+ if ($error->getCode() == DB_DATAOBJECT_ERROR_NODATA) {
+
+ // Do nothing.
+
+ } else {
+ parent::handleError($error);
+ }
+ }
+
}