check-fancy test gave confusing output (not the real message)

diff --git a/index.php b/index.php
index f258a52397541f9dc22622fc238474417afef01e..674099e7128c1193547cf1fe689a1e6032e0eb50 100644 (file)
--- a/index.php
+++ b/index.php
@@ -141,6 +141,11 @@ function handleError($error)
 
 set_exception_handler('handleError');
 
+// quick check for fancy URL auto-detection support in installer.
+if (preg_replace("/\?.+$/", "", $_SERVER['REQUEST_URI']) === preg_replace("/^\/$/", "", (dirname($_SERVER['REQUEST_URI']))) . '/check-fancy') {
+    die("Fancy URL support detection succeeded. We suggest you enable this to get fancy (pretty) URLs.");
+}
+
 require_once INSTALLDIR . '/lib/common.php';
 
 /**
@@ -216,12 +221,6 @@ function isLoginAction($action)
 
 function main()
 {
-    $_SERVER['REDIRECT_URL'] = preg_replace("/\?.+$/", "", $_SERVER['REQUEST_URI']);
-
-    // quick check for fancy URL auto-detection support in installer.
-    if (isset($_SERVER['REDIRECT_URL']) && (preg_replace("/^\/$/", "", (dirname($_SERVER['REQUEST_URI']))) . '/check-fancy') === $_SERVER['REDIRECT_URL']) {
-        die("Fancy URL support detection succeeded. We suggest you enable this to get fancy (pretty) URLs.");
-    }
     global $user, $action;
 
     if (!_have_config()) {

diff --git a/lib/common.php b/lib/common.php
index ca02a3e7fbc8f7854b570f059bc19abca950198a..4592fd15a59c266f704927b43402b90b7c217a05 100644 (file)
--- a/lib/common.php
+++ b/lib/common.php
@@ -19,10 +19,6 @@
 
 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';