composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-19 00:28:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue in the computation of the application absolute path (Windows)

Browse Source 
SVN:trunk[1291]
This commit is contained in:
Romain Quetiez
2011-06-22 08:15:30 +00:00
parent 2c8963784c
commit 5d37201391
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/utils.inc.php
View File

@@ -398,7 +398,9 @@ class utils
{
$sAbsoluteUrl = self::GetAbsoluteUrl(false, $bForceHTTPS); // False => Don't get the query string
$sCurrentScript = realpath($_SERVER['SCRIPT_FILENAME']);
$sCurrentRelativePath = str_replace(APPROOT, '', $sCurrentScript);
$sCurrentScript = str_replace('\\', '/', $sCurrentScript); // canonical path
$sAppRoot = str_replace('\\', '/', APPROOT); // canonical path
$sCurrentRelativePath = str_replace($sAppRoot, '', $sCurrentScript);
$sAppRootPos = strpos($sAbsoluteUrl, $sCurrentRelativePath);
if ($sAppRootPos !== false)
@@ -407,7 +409,7 @@ class utils
}
else
{
throw new Exception("Failed to determine application root path $sAbsoluteUrl ($sCurrentRelativePath)");
throw new Exception("Failed to determine application root path $sAbsoluteUrl ($sCurrentRelativePath) APPROOT:'$sAppRoot'");
}
return $sAbsoluteUrl;
}