From 52cb7b0beaf72b69a58d77cc77a1c1f8f130fc35 Mon Sep 17 00:00:00 2001 From: rMalie Date: Thu, 26 Jan 2012 16:27:41 +0000 Subject: [PATCH] // Fix Controller->addCss(), CSS of theme are called before CSS of modules git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12723 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/Controller.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/Controller.php b/classes/Controller.php index 2423c6ccb..aad63d9d2 100644 --- a/classes/Controller.php +++ b/classes/Controller.php @@ -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); } }