diff options
author | mattab <matthieu.aubry@gmail.com> | 2013-12-26 13:38:09 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2013-12-26 13:38:09 +0400 |
commit | 1782c1e1821d5c340357363be773c9ad3d094827 (patch) | |
tree | 48506226991472da4497170c35263452a48cec57 /core/Theme.php | |
parent | 3a4363ce0091d2d08a40b608f428ccbec9c24e93 (diff) |
Remove query string before checking if file exists, for windows + open_basedir. fixes #4438
Diffstat (limited to 'core/Theme.php')
-rw-r--r-- | core/Theme.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/core/Theme.php b/core/Theme.php index 785d37382f..9e1d694964 100644 --- a/core/Theme.php +++ b/core/Theme.php @@ -130,7 +130,14 @@ class Theme $newThemePath = "plugins/" . $this->themeName; $overridingAsset = str_replace($defaultThemePath, $newThemePath, $pathAsset); - if(file_exists($overridingAsset)) { + // Strip trailing query string + $fileToCheck = $overridingAsset; + $queryStringPos = strpos($fileToCheck, '?'); + if( $queryStringPos !== 0) { + $fileToCheck = substr($fileToCheck, 0, $queryStringPos); + } + + if(file_exists($fileToCheck)) { return str_replace($pathAsset, $overridingAsset, $source); } return $source; |