diff --git a/application/themehandler.class.inc.php b/application/themehandler.class.inc.php index 19f090b33..3cb5ba577 100644 --- a/application/themehandler.class.inc.php +++ b/application/themehandler.class.inc.php @@ -606,6 +606,10 @@ CSS; { foreach ($aMatches[1] as $path) { + $iRemainingClosingParenthesisPos = strpos($path, ')'); + if ($iRemainingClosingParenthesisPos !== false){ + $path = substr($path, 0, $iRemainingClosingParenthesisPos); + } if (!array_key_exists($path, $aCompleteUrls) && !array_key_exists($path, $aToCompleteUrls)) { diff --git a/test/application/ThemeHandlerTest.php b/test/application/ThemeHandlerTest.php index 9d7bf89d4..d8b15b7f9 100644 --- a/test/application/ThemeHandlerTest.php +++ b/test/application/ThemeHandlerTest.php @@ -518,6 +518,7 @@ JSON; "\$approot-relative + \"css/ui-lightness/images/toto.png?v=\" + \$version", '$approot-relative + \'css/ui-lightness/images/titi.gif?v=\' + $version1', '"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7?v=" + $version', + '$approot-relative + \'node_modules/raleway-webfont/fonts/Raleway-Thin.jpeg\'', ]; $aIncludedUrls['aCompleteUrls']; diff --git a/test/application/theme-handler/getimages/test-getimages.scss b/test/application/theme-handler/getimages/test-getimages.scss index 5435c5d2d..a27c95e83 100644 --- a/test/application/theme-handler/getimages/test-getimages.scss +++ b/test/application/theme-handler/getimages/test-getimages.scss @@ -6,4 +6,5 @@ background: #666666 url($approot-relative + 'css/ui-lightness/images/titi.gif?v= list-style-image: url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7?v=" + $version); background-image: url('css/ui-lightness/images/tutu.jpg'); background-image: url("css/ui-lightness/images/tata.jpeg"); -background-image: url("css/ui-lightness/images/tete.jpeg?g=" + $attr); \ No newline at end of file +background-image: url("css/ui-lightness/images/tete.jpeg?g=" + $attr); +url($approot-relative + 'node_modules/raleway-webfont/fonts/Raleway-Thin.jpeg') format('truetype'), \ No newline at end of file