Skip to content

Commit 6e7c85c

Browse files
author
Korshenko, Olexii(okorshenko)
committed
Merge pull request #668 from magento-folks/public
[Folks] Merge Public PRs
2 parents f8cc46a + 1ee941e commit 6e7c85c

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

app/code/Magento/Catalog/Model/Product.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
* @method string getUrlKey()
3030
* @method Product setUrlKey(string $urlKey)
3131
* @method Product setRequestPath(string $requestPath)
32+
* @method Product setWebsiteIds(array $ids)
3233
*
3334
* @SuppressWarnings(PHPMD.LongVariable)
3435
* @SuppressWarnings(PHPMD.ExcessivePublicCount)

app/code/Magento/Quote/Model/QuoteManagement.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -467,8 +467,9 @@ protected function submitQuote(QuoteEntity $quote, $orderData = [])
467467
$this->eventManager->dispatch(
468468
'sales_model_service_quote_submit_failure',
469469
[
470-
'order' => $order,
471-
'quote' => $quote
470+
'order' => $order,
471+
'quote' => $quote,
472+
'exception' => $e
472473
]
473474
);
474475
throw $e;

app/code/Magento/Theme/Model/View/Design.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public function getConfigurationDesignTheme($area = null, array $params = [])
169169
$theme = null;
170170
$store = isset($params['store']) ? $params['store'] : null;
171171

172-
if ($this->_isThemePerStoveView($area)) {
172+
if ($this->_isThemePerStoreView($area)) {
173173
if ($this->_storeManager->isSingleStoreMode()) {
174174
$theme = $this->_scopeConfig->getValue(
175175
self::XML_PATH_THEME_ID,
@@ -197,7 +197,7 @@ public function getConfigurationDesignTheme($area = null, array $params = [])
197197
* @param string $area
198198
* @return bool
199199
*/
200-
private function _isThemePerStoveView($area)
200+
private function _isThemePerStoreView($area)
201201
{
202202
return $area == self::DEFAULT_AREA;
203203
}

0 commit comments

Comments
 (0)