X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fcommon.php;h=c31c45f62612f8d218f6ef8cfe33a72ad3b94c17;hb=11dc170eade226e3db9f26742b24ebecff83b490;hp=0d60657a35b85e252d97d944a5f91af127e72061;hpb=f1bfbece06d7db20fa144fe5ac8a2f6c589eff45;p=quix0rs-gnu-social.git diff --git a/lib/common.php b/lib/common.php index 0d60657a35..c31c45f626 100644 --- a/lib/common.php +++ b/lib/common.php @@ -19,24 +19,20 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -// @fixme shouldn't this be in index.php instead? -//exit with 200 response, if this is checking fancy from the installer -if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') { exit; } - // 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.') .'
';