From 0ba0f226276c72b5c7b5ce8fc6e025da347fd178 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sun, 27 Jun 2010 18:09:59 +0200 Subject: [PATCH] fix webroot when using symlinks --- inc/lib_base.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/inc/lib_base.php b/inc/lib_base.php index 0e12a0bacf3..aa14d3cec00 100755 --- a/inc/lib_base.php +++ b/inc/lib_base.php @@ -33,11 +33,12 @@ session_start(); // calculate the documentroot $SERVERROOT=substr(__FILE__,0,-17); -$DOCUMENTROOT=$_SERVER['DOCUMENT_ROOT']; +$DOCUMENTROOT=realpath($_SERVER['DOCUMENT_ROOT']); $SERVERROOT=str_replace("\\",'/',$SERVERROOT); -$SUBURI=substr($_SERVER["SCRIPT_FILENAME"],strlen($SERVERROOT)); +$SUBURI=substr(realpath($_SERVER["SCRIPT_FILENAME"]),strlen($SERVERROOT)); $WEBROOT=substr($_SERVER["SCRIPT_NAME"],0,strlen($_SERVER["SCRIPT_NAME"])-strlen($SUBURI)); + if($WEBROOT!='' and $WEBROOT[0]!=='/'){ $WEBROOT='/'.$WEBROOT; }