diff options
| author | Evan Prodromou <evan@status.net> | 2010-04-26 02:43:33 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-04-26 02:43:33 -0400 |
| commit | 5c05cd2b1a93d360bde7cb7dfc9ba39e5a5a7624 (patch) | |
| tree | 5b4092e365023c7729fcdd8260431d3ffb28b519 /lib/common.php | |
| parent | 14adb7cc41e3d5d4e543c1f13f7a60d3cadb5c71 (diff) | |
| parent | d7d3a50d8751f071aa95541813af1d190e71430e (diff) | |
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
Diffstat (limited to 'lib/common.php')
| -rw-r--r-- | lib/common.php | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/lib/common.php b/lib/common.php index 8d2e6b420..45946c216 100644 --- a/lib/common.php +++ b/lib/common.php @@ -71,6 +71,7 @@ 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 @@ -127,6 +128,17 @@ require_once INSTALLDIR.'/lib/subs.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) { |