Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

2013-04-18 18:23:18 +02:00
parent c9a53bf491 dcb46e7867
commit 8251e98323
10 changed files with 25 additions and 33 deletions
@@ -2121,9 +2121,12 @@ exit;
 	 */
 	public static function clearCache($smarty = null, $tpl = false, $cache_id = null, $compile_id = null)
 	{
-		if (is_null($smarty))
+		if ($smarty === null)
 			$smarty = Context::getContext()->smarty;
-		
+
+		if ($smarty === null)
+			return;
+
 		if (!$tpl && $cache_id === null && $compile_id === null)
 			return $smarty->clearAllCache();

@@ -2456,4 +2459,3 @@ function cmpPriceDesc($a, $b)
 		return -1;
 	return 0;
 }
-