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

// Fix Controller->addCss(), CSS of theme are called before CSS of modules

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12723 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-01-26 16:27:41 +00:00
parent 8a386d2dcb
commit 52cb7b0bea
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Controller.php
+3 -3
View File
@@ -239,20 +239,20 @@ abstract class ControllerCore
{
$css_path = Media::getCSSPath($css_file, $media);
if ($css_path)
$this->css_files = array_merge($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)
$this->css_files = array_merge($css_path, $this->css_files);
$this->css_files = array_merge($this->css_files, $css_path);
}
}
else if (is_string($css_uri) && strlen($css_uri) > 1)
{
$css_path = Media::getCSSPath($css_uri, $css_media_type);
if ($css_path)
$this->css_files = array_merge($css_path, $this->css_files);
$this->css_files = array_merge($this->css_files, $css_path);
}
}