Pull back for now on switch of PEAR error mode to exceptions; seems to trigger out exceptions at various times we don't want them.

For instance this was throwing an exception for DB_DataObject::staticGet when there's no match... definitely not what we want when all our code expects to get a nice null.
Example of this causing trouble: http://gitorious.org/statusnet/mainline/merge_requests/131

Revert "Don't attempt to retrieve the current user from the DB while processing a DB error"

This reverts commit 68347691b0c7fb3f81415abd7fcdc5aec85cc554.

Revert "Use PHP exceptions for PEAR error handling."

This reverts commit d8212977ce7f911d4f9bd6e55f94aea059a86782.

1 files changed, 0 insertions, 12 deletions

diff --git a/lib/common.php b/lib/common.php
index 047dc5a7b..5d53270e3 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -71,7 +71,6 @@ if (!function_exists('dl')) {
 # global configuration object
 
 require_once('PEAR.php');
-require_once('PEAR/Exception.php');
 require_once('DB/DataObject.php');
 require_once('DB/DataObject/Cast.php'); # for dates
 
@@ -129,17 +128,6 @@ require_once INSTALLDIR.'/lib/activity.php';
 require_once INSTALLDIR.'/lib/clientexception.php';
 require_once INSTALLDIR.'/lib/serverexception.php';
 
-
-//set PEAR error handling to use regular PHP exceptions
-function PEAR_ErrorToPEAR_Exception($err)
-{
-    if ($err->getCode()) {
-        throw new PEAR_Exception($err->getMessage(), $err->getCode());
-    }
-    throw new PEAR_Exception($err->getMessage());
-}
-PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'PEAR_ErrorToPEAR_Exception');
-
 try {
     StatusNet::init(@$server, @$path, @$conffile);
 } catch (NoConfigException $e) {