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

// Fix currencies for multishop + meta

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8209 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-08-26 15:10:52 +00:00
parent 9271f5bebc
commit d33325c23f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/tabs/AdminMeta.php
+1 -1
View File
@@ -216,7 +216,7 @@ class AdminMeta extends AdminTab
public function getList($id_lang, $orderBy = NULL, $orderWay = NULL, $start = 0, $limit = NULL, $id_lang_shop = false) public function getList($id_lang, $orderBy = NULL, $orderWay = NULL, $start = 0, $limit = NULL, $id_lang_shop = false)
{ {
parent::getList($id_lang, $orderBy, $orderWay, $start, $limit, Context::getContext()->shop->getID()); parent::getList($id_lang, $orderBy, $orderWay, $start, $limit, Context::getContext()->shop->getID(true));
} }
/** /**
classes/Currency.php
+1 -1
View File
@@ -186,7 +186,7 @@ class CurrencyCore extends ObjectModel
$sql = 'SELECT * $sql = 'SELECT *
FROM `'._DB_PREFIX_.'currency` c FROM `'._DB_PREFIX_.'currency` c
'.$shop->sqlAsso('currency', 'c', false).' '.$shop->sqlAsso('currency', 'c').'
WHERE `deleted` = 0' WHERE `deleted` = 0'
.($active == 1 ? ' AND c.`active` = 1' : '').' .($active == 1 ? ' AND c.`active` = 1' : '').'
ORDER BY `name` ASC'; ORDER BY `name` ASC';