From 1782c1e1821d5c340357363be773c9ad3d094827 Mon Sep 17 00:00:00 2001 From: mattab Date: Thu, 26 Dec 2013 22:38:09 +1300 Subject: [PATCH] Remove query string before checking if file exists, for windows + open_basedir. fixes #4438 --- core/Theme.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/core/Theme.php b/core/Theme.php index 785d37382fc..9e1d6949647 100644 --- a/core/Theme.php +++ b/core/Theme.php @@ -130,7 +130,14 @@ private function rewriteAssetPathIfOverridesFound($src) $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;