From 1e8ed9d47eabc2e77aa945995dfd12996e5fde92 Mon Sep 17 00:00:00 2001 From: mDeflotte Date: Thu, 1 Dec 2011 12:58:35 +0000 Subject: [PATCH] // Little fix git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10827 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/Currency.php | 2 +- js/retro-compat.js.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/Currency.php b/classes/Currency.php index a1ce55165..1f90e31aa 100644 --- a/classes/Currency.php +++ b/classes/Currency.php @@ -201,7 +201,7 @@ class CurrencyCore extends ObjectModel public static function getCurrencies($object = false, $active = 1, Shop $shop = null) { if (!$shop) - $shop = new Shop(Context::getContext()->shop->getID(true)); + $shop = Context::getContext()->shop; $sql = 'SELECT * FROM `'._DB_PREFIX_.'currency` c diff --git a/js/retro-compat.js.php b/js/retro-compat.js.php index e0af24935..2e742dd47 100755 --- a/js/retro-compat.js.php +++ b/js/retro-compat.js.php @@ -39,7 +39,7 @@ $plugins = array( 'jquery.jqzoom.js' => array('new_file' => $plugins_folder.'jquery.jqzoom.js', 'name' => 'jqzoom'), 'jquery.serialScroll-1.2.2-min.js' => - array('new_file' => $plugins_folder.'jquery.serialScroll.js', 'name' => 'erialScroll'), + array('new_file' => $plugins_folder.'jquery.serialScroll.js', 'name' => 'serialScroll'), 'ifxtransfer.js' => array('new_file' => $plugins_folder.'jquery.ifxtransfer.js', 'name' => 'ifxtransfer'), 'jquery.autocomplete.js' =>