Skip to content
Permalink
Browse files

Merge branch 'b-6.x'

  • Loading branch information
Sieg committed Nov 15, 2019
2 parents 172a5ea + 4efe146 commit 0c3bbfb8cb547b964e9c27f3ddb28baee9a32328
Showing with 7 additions and 2 deletions.
  1. +5 −2 CHANGELOG.md
  2. +2 −0 source/Application/Model/Shop.php
@@ -79,7 +79,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Security
## [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)
@@ -780,7 +783,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
@@ -90,6 +90,8 @@ public function __construct()
parent::__construct();
if (!$this->isShopValid()) {
\OxidEsales\Eshop\Core\Registry::getLogger()->error('Shop is not valid');
return;
}

0 comments on commit 0c3bbfb

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