summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-02-12 16:05:37 -0500
committerEvan Prodromou <evan@controlyourself.ca>2009-02-12 16:05:37 -0500
commit3b5fd8fb6bbfa95efe3294ea77ae809dab071f99 (patch)
treecde49da4754faa0892088cb6cb14831ed6339ff0 /lib
parentb09eb06dae77be27e56d1573de0de7d393950ce5 (diff)
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.
Diffstat (limited to 'lib')
-rw-r--r--lib/action.php26
1 files changed, 0 insertions, 26 deletions
diff --git a/lib/action.php b/lib/action.php
index e3a8ef62c..bd38bf79c 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;
}
@@ -856,21 +845,6 @@ 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