From 9078290c017355c8182a8f1c7c22e0c6e37608ce Mon Sep 17 00:00:00 2001 From: rGaillard Date: Mon, 2 Dec 2013 16:18:59 +0100 Subject: [PATCH] // small fix --- controllers/front/PageNotFoundController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/controllers/front/PageNotFoundController.php b/controllers/front/PageNotFoundController.php index 98babe654..2b4a830a7 100644 --- a/controllers/front/PageNotFoundController.php +++ b/controllers/front/PageNotFoundController.php @@ -38,12 +38,12 @@ class PageNotFoundControllerCore extends FrontController header('HTTP/1.1 404 Not Found'); header('Status: 404 Not Found'); - if (in_array(Tools::strtolower(substr($_SERVER['REQUEST_URI'], -3)), array('png', 'jpg', 'gif'))) + if (preg_match('/\.(gif|jpe?g|png|ico)$/i', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH))) { if ((bool)Configuration::get('PS_REWRITING_SETTINGS')) - preg_match('#([0-9]+)(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/(.+)\.(png|jpg|gif)$#', $_SERVER['REQUEST_URI'], $matches); + preg_match('#([0-9]+)(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/(.+)\.(png|jpe?g|gif)$#', $_SERVER['REQUEST_URI'], $matches); if ((!isset($matches[2]) || empty($matches[2])) && !(bool)Configuration::get('PS_REWRITING_SETTINGS')) - preg_match('#/([0-9]+)(\-[_a-zA-Z]*)\.(png|jpg|gif)$#', $_SERVER['REQUEST_URI'], $matches); + preg_match('#/([0-9]+)(\-[_a-zA-Z]*)\.(png|jpe?g|gif)$#', $_SERVER['REQUEST_URI'], $matches); if (is_array($matches) && !empty($matches[2]) && Tools::strtolower(substr($matches[2], -8)) != '_default' && is_numeric($matches[1])) {