X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fcommon.php;h=c31c45f62612f8d218f6ef8cfe33a72ad3b94c17;hb=11dc170eade226e3db9f26742b24ebecff83b490;hp=2a11ab722ddc0d71d3bf0107a6faebc842e909e7;hpb=8ff45823bad2d2464be69c0f25162c3238f8f518;p=quix0rs-gnu-social.git diff --git a/lib/common.php b/lib/common.php index 2a11ab722d..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 // TRANS: Error message displayed when no configuration file was found for a StatusNet installation. - echo '
'. _('No configuration file found. ') .'
'; + echo ''. _('No configuration file found.') .'
'; // TRANS: Error message displayed when no configuration file was found for a StatusNet installation. // TRANS: Is followed by a list of directories (separated by HTML breaks). - echo ''. _('I looked for configuration files in the following places: ') .'
';
+ echo '
'. _('I looked for configuration files in the following places:') .'
';
echo implode($e->configFiles, '
');
// TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
echo '
'. _('You may wish to run the installer to fix this.') .'
';