X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fcommon.php;h=c31c45f62612f8d218f6ef8cfe33a72ad3b94c17;hb=ec98fd0c438f5b8f8e5eeee893ad84f121b7249f;hp=de12f342bad5dbd1415725f6da8e297a6063db7f;hpb=201efe6b62f57a479f4d24dca7142f5dff7b0f59;p=quix0rs-gnu-social.git

diff --git a/lib/common.php b/lib/common.php
index de12f342ba..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 . '/framework.php';
+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 '<p>'. _('No configuration file found. ') .'</p>';
+    echo '<p>'. _('No configuration file found.') .'</p>';
     // 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 '<p>'. _('I looked for configuration files in the following places: ') .'<br /> ';
+    echo '<p>'. _('I looked for configuration files in the following places:') .'<br /> ';
     echo implode($e->configFiles, '<br />');
     // TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
     echo '<p>'. _('You may wish to run the installer to fix this.') .'</p>';