Skip to content
Permalink
Browse files

Merge branch 'pr733' into b-6.x

  • Loading branch information
Sieg committed Nov 15, 2019
2 parents 6c8f69f + f8e25f9 commit 4efe146fd7cdc2b7572018d1ee8dadd8f55b1519
Showing with 7 additions and 2 deletions.
  1. +5 −2 CHANGELOG.md
  2. +2 −0 source/Application/Model/Shop.php
@@ -4,7 +4,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [6.5.1] - Unreleased
## [6.6.0] - Unreleased

### Added
- Add logging to shop constructor if shop is not valid [PR-733](https://github.com/OXID-eSales/oxideshop_ce/pull/733)

### Fixed
- Fixed missed deprecated getConfig and getSession method usages [PR-721](https://github.com/OXID-eSales/oxideshop_ce/pull/721)
@@ -705,7 +708,7 @@ See
- [OXID eShop v6.0.0 Beta1: Overview of Changes](https://oxidforge.org/en/oxid-eshop-v6-0-0-beta1-overview-of-changes.html)
- [OXID eShop v6.0.0 Beta1: Detailed Code Changelog](https://oxidforge.org/en/oxid-eshop-v6-0-0-beta1-detailed-code-changelog.html)
[6.5.1]: https://github.com/OXID-eSales/oxideshop_ce/compare/v6.5.0...b-6.x
[6.6.0]: https://github.com/OXID-eSales/oxideshop_ce/compare/v6.5.0...b-6.x
[6.5.0]: https://github.com/OXID-eSales/oxideshop_ce/compare/v6.4.0...v6.5.0
[6.4.0]: https://github.com/OXID-eSales/oxideshop_ce/compare/v6.3.5...v6.4.0
[6.3.6]: https://github.com/OXID-eSales/oxideshop_ce/compare/v6.3.5...v6.3.6
@@ -93,6 +93,8 @@ public function __construct()
parent::__construct();
if (!$this->isShopValid()) {
\OxidEsales\Eshop\Core\Registry::getLogger()->error('Shop is not valid');
return;
}

0 comments on commit 4efe146

Please sign in to comment.
You can’t perform that action at this time.