From d33325c23f79ab654bf4da0f8ec0d0a8987a9f6d Mon Sep 17 00:00:00 2001
From: rMalie <raphael.malie@prestashop.com>
Date: Fri, 26 Aug 2011 15:10:52 +0000
Subject: [PATCH] // Fix currencies for multishop + meta

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8209 b9a71923-0436-4b27-9f14-aed3839534dd
---
 admin-dev/tabs/AdminMeta.php | 2 +-
 classes/Currency.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin-dev/tabs/AdminMeta.php b/admin-dev/tabs/AdminMeta.php
index ece61044a..547ceddaf 100644
--- a/admin-dev/tabs/AdminMeta.php
+++ b/admin-dev/tabs/AdminMeta.php
@@ -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)
 	{
-		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));
 	}
 	
 	/**
diff --git a/classes/Currency.php b/classes/Currency.php
index 991c850c1..cb92464fb 100644
--- a/classes/Currency.php
+++ b/classes/Currency.php
@@ -186,7 +186,7 @@ class CurrencyCore extends ObjectModel
 
 		$sql = 'SELECT *
 				FROM `'._DB_PREFIX_.'currency` c
-				'.$shop->sqlAsso('currency', 'c', false).'
+				'.$shop->sqlAsso('currency', 'c').'
 				WHERE `deleted` = 0'
 					.($active == 1 ? ' AND c.`active` = 1' : '').'
 				ORDER BY `name` ASC';