GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

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

This commit is contained in:
Mikael Nordfeldth 2014-07-10 13:10:48 +02:00
parent e15f322187
commit a2360f7538
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
index.php
View File

@ -141,6 +141,11 @@ function handleError($error)
set_exception_handler('handleError'); 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'; require_once INSTALLDIR . '/lib/common.php';
/** /**
@ -216,12 +221,6 @@ function isLoginAction($action)
function main() 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; global $user, $action;
if (!_have_config()) { if (!_have_config()) {

4
lib/common.php
View File

@ -19,10 +19,6 @@
if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } 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, // All the fun stuff to actually initialize StatusNet's framework code,
// without loading up a site configuration. // without loading up a site configuration.
require_once INSTALLDIR . '/lib/framework.php'; require_once INSTALLDIR . '/lib/framework.php';