Merge branch 'pr643' into b-6.x

OXID-eSales · Apr 19, 2018 · 54e83e7 · 54e83e7
2 parents 3975002 + 98db747
commit 54e83e7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 - Fixed notices and performance improved in FontendController::isVatIncluded [PR-642](https://github.com/OXID-eSales/oxideshop_ce/pull/642)
+- Use error_404_handler in article list controller in place of outdated 404 handling [PR-643](https://github.com/OXID-eSales/oxideshop_ce/pull/643)
 
 ## [6.2.0] - 2018-03-27
 

diff --git a/source/Application/Controller/ArticleListController.php b/source/Application/Controller/ArticleListController.php
@@ -247,7 +247,7 @@ protected function _checkRequestedPage()
         if (!$pageCount && $currentPageNumber) {
             // display error if category has no products, but page number is entered
             $this->_iActPage = 0;
-            \OxidEsales\Eshop\Core\Registry::getUtils()->handlePageNotFoundError($this->getActiveCategory()->getLink());
+            error_404_handler($this->getActiveCategory()->getLink());
         }
     }