From 72d1245de5bb2a1b2106446eb54befcee99d9bb6 Mon Sep 17 00:00:00 2001
From: rGaillard <remi.gaillard@prestashop.com>
Date: Thu, 8 Mar 2012 17:07:52 +0000
Subject: [PATCH] [-] BO: improvement of load time

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13986 b9a71923-0436-4b27-9f14-aed3839534dd
---
 classes/Translate.php             | 4 ++--
 config/smartyfront.config.inc.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/classes/Translate.php b/classes/Translate.php
index a68785b59..020abc22b 100644
--- a/classes/Translate.php
+++ b/classes/Translate.php
@@ -49,7 +49,7 @@ class TranslateCore
 		if (!isset($modules_tabs))
 			$modules_tabs = Tab::getModuleTabList();
 
-		if (!is_array($_LANGADM))
+		if ($_LANGADM == null)
 		{
 			$iso = Context::getContext()->language->iso_code;
 			include_once(_PS_TRANSLATIONS_DIR_.$iso.'/admin.php');
@@ -141,7 +141,7 @@ class TranslateCore
 		$cache_key = $name.'|'.$string.'|'.$source;
 		if (!isset($lang_cache[$cache_key]))
 		{
-			if (!is_array($_MODULES))
+			if ($_MODULES == null)
 				return str_replace('"', '&quot;', $string);
 
 			// set array key to lowercase for 1.3 compatibility
diff --git a/config/smartyfront.config.inc.php b/config/smartyfront.config.inc.php
index 4041e58e3..cb22d8830 100644
--- a/config/smartyfront.config.inc.php
+++ b/config/smartyfront.config.inc.php
@@ -44,9 +44,9 @@ function smartyTranslate($params, &$smarty)
 	else if ($params['pdf']) 
 		return Translate::getPdfTranslation($params['s']);
 
-	if (is_array($lang_array) && key_exists($key, $lang_array))
+	if ($lang_array != null && isset($lang_array[$key]))
 		$msg = $lang_array[$key];
-	elseif (is_array($lang_array) && key_exists(Tools::strtolower($key), $lang_array))
+	elseif ($lang_array != null && isset($lang_array[Tools::strtolower($key)]))
 		$msg = $lang_array[Tools::strtolower($key)];
 	else
 		$msg = $params['s'];