Code to handle PEAR_Errors raised by DB_DataObject that are bubbling

up, but are actually expected and can safely be ignored.

1 files changed, 22 insertions, 0 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);
+        }
+    }
+    
 }