Merge remote-tracking branch 'origin/development' into development

2013-09-20 10:47:17 +02:00
parent 91ae972655 f8ca06d927
commit 4f639329e9
5 changed files with 36 additions and 12 deletions
@@ -53,7 +53,7 @@ class BlockCurrencies extends Module
 		if (Configuration::get('PS_CATALOG_MODE'))
 			return false;

-		if (!count(Currency::getCurrencies()))
+		if (!Currency::isMultiCurrencyActivated())
 			return false;

 		$this->smarty->assign('blockcurrencies_sign', $this->context->currency->sign);