X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fcommon.php;h=c31c45f62612f8d218f6ef8cfe33a72ad3b94c17;hb=11dc170eade226e3db9f26742b24ebecff83b490;hp=34d77c3f6d1ed621ecf039c6b3568d8e43e66568;hpb=b26eccf33cf69c04a96d5d6d3eddc0ef68ffd4b1;p=quix0rs-gnu-social.git diff --git a/lib/common.php b/lib/common.php index 34d77c3f6d..c31c45f626 100644 --- a/lib/common.php +++ b/lib/common.php @@ -1,7 +1,7 @@ getCode() == DB_DATAOBJECT_ERROR_NODATA) { - return; - } - 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'); +// All the fun stuff to actually initialize StatusNet's framework code, +// without loading up a site configuration. +require_once INSTALLDIR . '/lib/framework.php'; try { - StatusNet::init(@$server, @$path, @$conffile); + GNUsocial::init(@$server, @$path, @$conffile); } catch (NoConfigException $e) { // XXX: Throw a conniption if database not installed // XXX: Find a way to use htmlwriter for this instead of handcoded markup