Merge branch 'MAGETWO-34990' into MAGETWO-26762

vpaladiychuk · vpaladiychuk · commit 2d0d206758a4 · 2015-03-26T17:10:36.000+02:00
diff --git a/lib/internal/Magento/Framework/Data/Collection/Db.php b/lib/internal/Magento/Framework/Data/Collection/Db.php
@@ -165,7 +165,7 @@ public function setConnection($conn)
     {
         if (!$conn instanceof \Zend_Db_Adapter_Abstract) {
             throw new \Magento\Framework\Exception\LocalizedException(
-                __('dbModel read resource does not implement \Zend_Db_Adapter_Abstract')
+                new \Magento\Framework\Phrase('dbModel read resource does not implement \Zend_Db_Adapter_Abstract')
             );
         }
 

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ public function setConnection($conn)`
`165`	`165`	`{`
`166`	`166`	`if (!$conn instanceof \Zend_Db_Adapter_Abstract) {`
`167`	`167`	`throw new \Magento\Framework\Exception\LocalizedException(`
`168`		`- __('dbModel read resource does not implement \Zend_Db_Adapter_Abstract')`
	`168`	`+ new \Magento\Framework\Phrase('dbModel read resource does not implement \Zend_Db_Adapter_Abstract')`
`169`	`169`	`);`
`170`	`170`	`}`
`171`	`171`