From 3b5fd8fb6bbfa95efe3294ea77ae809dab071f99 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 12 Feb 2009 16:05:37 -0500
Subject: 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.
---
 actions/emailsettings.php | 22 ----------------------
 1 file changed, 22 deletions(-)

(limited to 'actions/emailsettings.php')

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index c6c983453..b84acb214 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -487,26 +487,4 @@ 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);
-        }
-    }
-    
 }
-- 
cgit v1.2.3-54-g00ecf