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: [PATCH] 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 ----------------------
 actions/register.php      | 23 +----------------------
 lib/action.php            | 26 --------------------------
 3 files changed, 1 insertion(+), 70 deletions(-)

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index c6c9834538..b84acb2141 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);
-        }
-    }
-    
 }
diff --git a/actions/register.php b/actions/register.php
index 853bd0cf66..5d7a8ce690 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?
diff --git a/lib/action.php b/lib/action.php
index e3a8ef62c7..bd38bf79cc 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -82,17 +82,6 @@ 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;
     }
@@ -855,21 +844,6 @@ class Action extends HTMLOutputter // lawsuit
         throw new ClientException($msg, $code);
     }
 
-    /**
-     * 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
      *