From f1e265fad4ec60ec2d9cd8a443c1eb36d833fa1e Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.com>
Date: Mon, 3 Oct 2011 09:02:42 +0000
Subject: [PATCH] //small fix

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8956 b9a71923-0436-4b27-9f14-aed3839534dd
---
 classes/AdminController.php |  2 --
 classes/Controller.php      | 37 ++++++++++++++++++++++++++-----------
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/classes/AdminController.php b/classes/AdminController.php
index 6c01b4144..c7529e546 100644
--- a/classes/AdminController.php
+++ b/classes/AdminController.php
@@ -905,9 +905,7 @@ class AdminControllerCore extends Controller
 
 	public function setMedia()
 	{
-		$this->addCSS(_PS_JS_DIR_.'jquery/datepicker/datepicker.css', 'all');
 		$this->addCSS(_PS_CSS_DIR_.'admin.css', 'all');
-		$this->addCSS(_PS_CSS_DIR_.'jquery.cluetip.css', 'all');
 		$this->addCSS(__PS_BASE_URI__.str_replace(_PS_ROOT_DIR_.DIRECTORY_SEPARATOR,'', _PS_ADMIN_DIR_).'/themes/default/admin.css', 'all');
 		if ($this->context->language->is_rtl)
 			$this->addCSS(_THEME_CSS_DIR_.'rtl.css');
diff --git a/classes/Controller.php b/classes/Controller.php
index 5431e197c..ed5307ffd 100644
--- a/classes/Controller.php
+++ b/classes/Controller.php
@@ -179,17 +179,25 @@ abstract class ControllerCore
 		if (is_array($css_uri))
 			foreach($css_uri as $css_file => $media)
 			{
-				if (is_string($css_file))
+				if (is_string($css_file) AND strlen($css_file) > 1)
 				{
-					if ($css_path = Media::getCSSPath($css_file, $media))
-							$this->css_files = array_merge($css_path, $this->css_files);
+					$css_path = Media::getCSSPath($css_file, $media);
+					if ($css_path)
+						$this->css_files = array_merge($css_path, $this->css_files);
+				}
+				else 
+				{
+					$css_path = Media::getCSSPath($media, $css_media_type);
+					if ($css_path)
+						$this->css_files = array_merge($css_path, $this->css_files);
 				}
-				else if ($css_path = Media::getCSSPath($media, $css_media_type))
-					$this->css_files = array_merge($css_path, $this->css_files);
 			}
-
-		else if ($css_path = Media::getCSSPath($css_uri, $css_media_type))
-			$this->css_files = array_merge($css_path, $this->css_files);
+		else if (is_string($css_uri) AND 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);
+		}
 	}
 
 	/**
@@ -202,10 +210,17 @@ abstract class ControllerCore
 	{
 		if (is_array($js_uri))
 			foreach($js_uri as $js_file)
-				if ($js_path = Media::getJSPath($js_file))
+			{
+				$js_path = Media::getJSPath($js_file);
+				if ($js_path)
 					$this->js_files[] = $js_path;
-		else if ($js_path = Media::getJSPath($js_uri))
-			$this->js_files[] = $js_path;
+			}
+		else
+		{
+			$js_path = Media::getJSPath($js_uri);
+				if ($js_path)
+					$this->js_files[] = $js_path;
+		}
 	}
 	
 	/**