Explorar o código

#2641 CSS files are included many times.

Alex Trofimov %!s(int64=5) %!d(string=hai) anos
pai
achega
b6b33e31c5
Modificáronse 1 ficheiros con 2 adicións e 2 borrados
  1. 2 2
      inc/classes/BxDolTemplate.php

+ 2 - 2
inc/classes/BxDolTemplate.php

@@ -2094,7 +2094,7 @@ class BxDolTemplate extends BxDolFactory implements iBxDolSingleton
         		 * Is mainly needed for CSS files which are gotten from LESS compiler.
         		 */
         		$sContent = preg_replace_callback(
-	                "'@import\s+[\'|\"]*\s*" . str_replace("/", "\/", BX_DOL_URL_ROOT) . "([a-zA-Z0-9\.\/_-]+)\s*[\'|\"]*\s*;'", function ($aMatches)  use($oTemplate, $sPath, $aIncluded) {
+	                "'@import\s+[\'|\"]*\s*" . str_replace("/", "\/", BX_DOL_URL_ROOT) . "([a-zA-Z0-9\.\/_-]+)\s*[\'|\"]*\s*;'", function ($aMatches)  use($oTemplate, $sPath, &$aIncluded) {
 	                	return $oTemplate->_compileCss(realpath(BX_DIRECTORY_PATH_ROOT . $aMatches[1]), $aIncluded);
 	                }, $sContent);
 
@@ -2103,7 +2103,7 @@ class BxDolTemplate extends BxDolFactory implements iBxDolSingleton
 				 * Is mainly needed for default CSS files.
 				 */
 	            $sContent = preg_replace_callback(
-	                "'@import\s+url\s*\(\s*[\'|\"]*\s*([a-zA-Z0-9\.\/_-]+)\s*[\'|\"]*\s*\)\s*;'", function ($aMatches)  use($oTemplate, $sPath, $aIncluded) {
+	                "'@import\s+url\s*\(\s*[\'|\"]*\s*([a-zA-Z0-9\.\/_-]+)\s*[\'|\"]*\s*\)\s*;'", function ($aMatches)  use($oTemplate, $sPath, &$aIncluded) {
 	                	return $oTemplate->_compileCss(realpath($sPath . dirname($aMatches[1])) . DIRECTORY_SEPARATOR . basename($aMatches[1]), $aIncluded);
 	                }, $sContent);