MAGETWO-63909: Merge branch 'bugfix/widget-theme-source' of github.com:Zefiryn/magento2 into MAGETWO-63909

ishakhsuvarov · ishakhsuvarov · commit 16d78aef07ff · 2017-01-31T12:07:46.000+02:00
diff --git a/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Options/ThemeId.php b/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Options/ThemeId.php
@@ -22,11 +22,11 @@ class ThemeId implements \Magento\Framework\Option\ArrayInterface
     protected $_resourceModel;
 
     /**
-     * @param \Magento\Theme\Model\ResourceModel\Theme\Collection $widgetResourceModel
+     * @param \Magento\Theme\Model\ResourceModel\Theme\CollectionFactory $widgetResourceModel
      */
-    public function __construct(\Magento\Theme\Model\ResourceModel\Theme\Collection $widgetResourceModel)
+    public function __construct(\Magento\Theme\Model\ResourceModel\Theme\CollectionFactory $widgetResourceModel)
     {
-        $this->_resourceModel = $widgetResourceModel;
+        $this->_resourceModel = $widgetResourceModel->create();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,11 @@ class ThemeId implements \Magento\Framework\Option\ArrayInterface`
`22`	`22`	`protected $_resourceModel;`
`23`	`23`
`24`	`24`	`/**`
`25`		`- * @param \Magento\Theme\Model\ResourceModel\Theme\Collection $widgetResourceModel`
	`25`	`+ * @param \Magento\Theme\Model\ResourceModel\Theme\CollectionFactory $widgetResourceModel`
`26`	`26`	`*/`
`27`		`- public function __construct(\Magento\Theme\Model\ResourceModel\Theme\Collection $widgetResourceModel)`
	`27`	`+ public function __construct(\Magento\Theme\Model\ResourceModel\Theme\CollectionFactory $widgetResourceModel)`
`28`	`28`	`{`
`29`		`- $this->_resourceModel = $widgetResourceModel;`
	`29`	`+ $this->_resourceModel = $widgetResourceModel->create();`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`/**`