dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Little fix

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10827 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2011-12-01 12:58:35 +00:00
parent e111883814
commit 1e8ed9d47e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
classes/Currency.php
View File

@@ -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

2
js/retro-compat.js.php
View File

@@ -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' =>