From 7f8a2a06c313ec7a42e7b52cbe13e413a9c9d86d Mon Sep 17 00:00:00 2001 From: fBrignoli Date: Wed, 11 Apr 2012 15:40:43 +0000 Subject: [PATCH] // perf --- classes/Supplier.php | 2 +- classes/Translate.php | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/classes/Supplier.php b/classes/Supplier.php index 8e6327f0b..8a90733fd 100644 --- a/classes/Supplier.php +++ b/classes/Supplier.php @@ -147,7 +147,7 @@ class SupplierCore extends ObjectModel } $nb_suppliers = count($suppliers); - $rewrite_settings = (int)Configuration::get('PS_REWRITING_SETTINGS') + $rewrite_settings = (int)Configuration::get('PS_REWRITING_SETTINGS'); for ($i = 0; $i < $nb_suppliers; $i++) if ($rewrite_settings) $suppliers[$i]['link_rewrite'] = Tools::link_rewrite($suppliers[$i]['name'], false); diff --git a/classes/Translate.php b/classes/Translate.php index f1fc6065a..1b234468d 100644 --- a/classes/Translate.php +++ b/classes/Translate.php @@ -159,7 +159,9 @@ class TranslateCore return str_replace('"', '"', $string); // set array key to lowercase for 1.3 compatibility - $_MODULES = array_change_key_case($_MODULES); + if (version_compare(_PS_VERSION_, '1.3.0.0') <= 0) + $_MODULES = array_change_key_case($_MODULES); + $currentKey = '<{'.strtolower($name).'}'.strtolower(_THEME_NAME_).'>'.strtolower($source).'_'.$key; $defaultKey = '<{'.strtolower($name).'}prestashop>'.strtolower($source).'_'.$key;