From f40a1cad8b55bafa08d7e96415d4d2f9c7059a38 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sun, 26 Jun 2011 00:59:09 +0200 Subject: [PATCH] not all http server add index.php to $_SERVER[SCRIPT_NAME], do it manually this fixes incorect generated links in some cases --- lib/base.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/base.php b/lib/base.php index 6aac2d9855d..c5a0403e3b9 100644 --- a/lib/base.php +++ b/lib/base.php @@ -35,7 +35,11 @@ $SERVERROOT=substr(__FILE__,0,-13); $DOCUMENTROOT=realpath($_SERVER['DOCUMENT_ROOT']); $SERVERROOT=str_replace("\\",'/',$SERVERROOT); $SUBURI=substr(realpath($_SERVER["SCRIPT_FILENAME"]),strlen($SERVERROOT)); -$WEBROOT=substr($_SERVER["SCRIPT_NAME"],0,strlen($_SERVER["SCRIPT_NAME"])-strlen($SUBURI)); +$scriptName=$_SERVER["SCRIPT_NAME"]; +if(substr($scriptName,-1)=='/'){//if the script isn't a file assume index.php + $scriptName.='index.php'; +} +$WEBROOT=substr($scriptName,0,strlen($scriptName)-strlen($SUBURI)); -- 2.39.5