Merge pull request #668 from magento-folks/public

[Folks] Merge Public PRs
magento · Oct 2, 2015 · 6e7c85c · 6e7c85c
2 parents f8cc46a + 1ee941e
commit 6e7c85c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/app/code/Magento/Catalog/Model/Product.php b/app/code/Magento/Catalog/Model/Product.php
@@ -29,6 +29,7 @@
  * @method string getUrlKey()
  * @method Product setUrlKey(string $urlKey)
  * @method Product setRequestPath(string $requestPath)
+ * @method Product setWebsiteIds(array $ids)
  *
  * @SuppressWarnings(PHPMD.LongVariable)
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)

diff --git a/app/code/Magento/Quote/Model/QuoteManagement.php b/app/code/Magento/Quote/Model/QuoteManagement.php
@@ -467,8 +467,9 @@ protected function submitQuote(QuoteEntity $quote, $orderData = [])
             $this->eventManager->dispatch(
                 'sales_model_service_quote_submit_failure',
                 [
-                    'order' => $order,
-                    'quote' => $quote
+                    'order'     => $order,
+                    'quote'     => $quote,
+                    'exception' => $e
                 ]
             );
             throw $e;

diff --git a/app/code/Magento/Theme/Model/View/Design.php b/app/code/Magento/Theme/Model/View/Design.php
@@ -169,7 +169,7 @@ public function getConfigurationDesignTheme($area = null, array $params = [])
         $theme = null;
         $store = isset($params['store']) ? $params['store'] : null;
 
-        if ($this->_isThemePerStoveView($area)) {
+        if ($this->_isThemePerStoreView($area)) {
             if ($this->_storeManager->isSingleStoreMode()) {
                 $theme = $this->_scopeConfig->getValue(
                     self::XML_PATH_THEME_ID,
@@ -197,7 +197,7 @@ public function getConfigurationDesignTheme($area = null, array $params = [])
      * @param string $area
      * @return bool
      */
-    private function _isThemePerStoveView($area)
+    private function _isThemePerStoreView($area)
     {
         return $area == self::DEFAULT_AREA;
     }