kenaug74/Sylius
1
0
Fork 0
mirror of https://github.com/Sylius/Sylius.git synced 2026-07-14 09:02:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #1 from pjedrzejewski/multi-channel

Browse source 
Fix the issue when money helper hits the db during warmup
This commit is contained in:
Michał Marcinkowski 2015-05-21 14:30:10 +02:00
commit c01bb1d59d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Sylius/Bundle/CurrencyBundle/Templating/Helper/MoneyHelper.php
View file

@ -33,7 +33,7 @@ class MoneyHelper extends BaseMoneyHelper
{
$this->currencyContext = $currencyContext;
parent::__construct($locale, $this->getDefaultCurrency());
parent::__construct($locale);
}
/**

2
src/Sylius/Bundle/MoneyBundle/Templating/Helper/MoneyHelper.php
View file

@ -31,7 +31,7 @@ class MoneyHelper extends Helper
* @param string $locale The locale used to format money.
* @param string $currency The default currency.
*/
public function __construct($locale, $currency)
public function __construct($locale, $currency = null)
{
$this->locale = $locale ?: \Locale::getDefault();
$this->currency = $currency;