diff options
| author | Evan Prodromou <evan@status.net> | 2010-03-17 09:38:39 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-03-17 09:38:39 -0500 |
| commit | 4761c07ad8d76f7c34d4db53d32d15e806ba1e88 (patch) | |
| tree | eb3d78ccde1778037165c92b6ec36c7465b54345 /lib/common.php | |
| parent | f21f78364a9cbde2ca535a3983b384707ad097ae (diff) | |
| parent | f62b8a80cf33ac8529d0736c51dc060a9d235369 (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'lib/common.php')
| -rw-r--r-- | lib/common.php | 12 |
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) { |