Skip to content

Commit d824558

Browse files
author
bnu
committed
Merge branch 'hotfix/1.8.26'
2 parents 656a22c + 76f9b97 commit d824558

File tree

6 files changed

+424
-421
lines changed

6 files changed

+424
-421
lines changed

classes/context/Context.class.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -2093,13 +2093,14 @@ function normalizeFilePath($file)
20932093
function getAbsFileUrl($file)
20942094
{
20952095
$file = self::normalizeFilePath($file);
2096+
$script_path = getScriptPath();
20962097
if(strpos($file, './') === 0)
20972098
{
2098-
$file = dirname($_SERVER['SCRIPT_NAME']) . '/' . substr($file, 2);
2099+
$file = $script_path . substr($file, 2);
20992100
}
21002101
elseif(strpos($file, '../') === 0)
21012102
{
2102-
$file = self::normalizeFilePath(dirname($_SERVER['SCRIPT_NAME']) . "/{$file}");
2103+
$file = self::normalizeFilePath($script_path . $file);
21032104
}
21042105

21052106
return $file;

0 commit comments

Comments
 (0)