Merge pull request #1 from pjedrzejewski/multi-channel

Fix the issue when money helper hits the db during warmup
Sylius · May 21, 2015 · c01bb1d · c01bb1d
2 parents 54a909a + cdccf82
commit c01bb1d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Sylius/Bundle/CurrencyBundle/Templating/Helper/MoneyHelper.php b/src/Sylius/Bundle/CurrencyBundle/Templating/Helper/MoneyHelper.php
@@ -33,7 +33,7 @@ public function __construct($locale, CurrencyContextInterface $currencyContext)
     {
         $this->currencyContext = $currencyContext;
 
-        parent::__construct($locale, $this->getDefaultCurrency());
+        parent::__construct($locale);
     }
 
     /**

diff --git a/src/Sylius/Bundle/MoneyBundle/Templating/Helper/MoneyHelper.php b/src/Sylius/Bundle/MoneyBundle/Templating/Helper/MoneyHelper.php
@@ -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;