dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] FO : BugFix : #PSCFV-2243 : CCC optimization on scripts compile each script two times

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15103 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vChabot
2012-05-09 13:30:12 +00:00
parent cdcf54b40e
commit 807252f5af
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/controller/Controller.php
+5 -5
View File
@@ -240,13 +240,13 @@ abstract class ControllerCore
if (is_string($css_file) && strlen($css_file) > 1)
{
$css_path = Media::getCSSPath($css_file, $media);
if ($css_path)
if ($css_path && !in_array($css_path, $this->css_files))
$this->css_files = array_merge($this->css_files, $css_path);
}
else
{
$css_path = Media::getCSSPath($media, $css_media_type);
if ($css_path)
if ($css_path && !in_array($css_path, $this->css_files))
$this->css_files = array_merge($this->css_files, $css_path);
}
}
@@ -270,14 +270,14 @@ abstract class ControllerCore
foreach ($js_uri as $js_file)
{
$js_path = Media::getJSPath($js_file);
if ($js_path)
if ($js_path && !in_array($js_path, $this->js_files))
$this->js_files[] = $js_path;
}
else
{
$js_path = Media::getJSPath($js_uri);
if ($js_path)
$this->js_files[] = $js_path;
if ($js_path)
$this->js_files[] = $js_path;
}
}