Merge commit 'refs/pull/4087/head' of https://github.com/magento/magento2 into MAGETWO-52574

Oleksii Korshenko · Oleksii Korshenko · commit 49d95470b633 · 2016-05-05T18:19:33.000-05:00
diff --git a/app/code/Magento/Directory/Model/Currency.php b/app/code/Magento/Directory/Model/Currency.php
@@ -233,7 +233,13 @@ public function convert($price, $toCurrency = null)
             return $price * $rate;
         }
 
-        throw new \Exception(__('Undefined rate from "%1-%2".', $this->getCode(), $toCurrency->getCode()));
+        throw new \Exception(
+            __(
+                'Undefined rate from "%1-%2".',
+                $this->getCode(),
+                (is_string($toCurrency)) ? $toCurrency : $toCurrency->getCode()
+            )
+        );
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,13 @@ public function convert($price, $toCurrency = null)`
`233`	`233`	`return $price * $rate;`
`234`	`234`	`}`
`235`	`235`
`236`		`- throw new \Exception(__('Undefined rate from "%1-%2".', $this->getCode(), $toCurrency->getCode()));`
	`236`	`+ throw new \Exception(`
	`237`	`+ __(`
	`238`	`+ 'Undefined rate from "%1-%2".',`
	`239`	`+ $this->getCode(),`
	`240`	`+ (is_string($toCurrency)) ? $toCurrency : $toCurrency->getCode()`
	`241`	`+ )`
	`242`	`+ );`
`237`	`243`	`}`
`238`	`244`
`239`	`245`	`/**`