Merge branch 'master' of https://github.com/opencart/opencart

hrhneil · Aug 28, 2020 · 5b126b1 · 5b126b1
2 parents fdc8e56 + bff633b
commit 5b126b1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/upload/extension/opencart/catalog/controller/module/banner.php b/upload/extension/opencart/catalog/controller/module/banner.php
@@ -16,7 +16,7 @@ public function index($setting) {
 		$results = $this->model_design_banner->getBanner($setting['banner_id']);
 
 		foreach ($results as $result) {
-			if (is_file(DIR_IMAGE . $result['image'])) {
+			if (is_file(DIR_IMAGE . html_entity_decode($result['image'], ENT_QUOTES, 'UTF-8'))) {
 				$data['banners'][] = [
 					'title' => $result['title'],
 					'link'  => $result['link'],

diff --git a/upload/extension/opencart/catalog/controller/module/carousel.php b/upload/extension/opencart/catalog/controller/module/carousel.php
@@ -6,7 +6,7 @@ public function index($setting) {
 
 		$this->load->model('design/banner');
 		$this->load->model('tool/image');
-		
+
 		$this->document->addStyle('catalog/view/javascript/jquery/swiper/css/swiper.min.css');
 		$this->document->addStyle('catalog/view/javascript/jquery/swiper/css/opencart.css');
 		$this->document->addScript('catalog/view/javascript/jquery/swiper/js/swiper.jquery.js');
@@ -16,7 +16,7 @@ public function index($setting) {
 		$results = $this->model_design_banner->getBanner($setting['banner_id']);
 
 		foreach ($results as $result) {
-			if (is_file(DIR_IMAGE . $result['image'])) {
+			if (is_file(DIR_IMAGE . html_entity_decode($result['image'], ENT_QUOTES, 'UTF-8'))) {
 				$data['banners'][] = [
 					'title' => $result['title'],
 					'link'  => $result['link'],

diff --git a/upload/extension/opencart/catalog/controller/module/slideshow.php b/upload/extension/opencart/catalog/controller/module/slideshow.php
@@ -10,13 +10,13 @@ public function index($setting) {
 		$this->document->addStyle('catalog/view/javascript/jquery/swiper/css/swiper.min.css');
 		$this->document->addStyle('catalog/view/javascript/jquery/swiper/css/opencart.css');
 		$this->document->addScript('catalog/view/javascript/jquery/swiper/js/swiper.jquery.js');
-		
+
 		$data['banners'] = [];
 
 		$results = $this->model_design_banner->getBanner($setting['banner_id']);
 
 		foreach ($results as $result) {
-			if (is_file(DIR_IMAGE . $result['image'])) {
+			if (is_file(DIR_IMAGE . html_entity_decode($result['image'], ENT_QUOTES, 'UTF-8'))) {
 				$data['banners'][] = [
 					'title' => $result['title'],
 					'link'  => $result['link'],

diff --git a/upload/install/opencart.sql b/upload/install/opencart.sql
@@ -1703,7 +1703,7 @@ INSERT INTO `oc_seo_profile` (`seo_profile_id`, `name`, `key`, `regex`, `push`,
 (7, 'Manufacturer', 'manufacturer_id', '(\\d+)', 'route=product/manufacturer/info', 'route,manufacturer_id', 2),
 (8, 'Language', 'language', '([a-z-]+)', '', 'language', -1),
 (9, 'Product', 'product_id', '(\\d+)', 'route=product/product', 'route,product_id', 100),
-(10, 'Route', 'route', '([a-zA-Z0-9\/]+)', '', 'route', 0);
+(10, 'Route', 'route', '([a-zA-Z0-9\/_]+)', '', 'route', 0);
 
 -----------------------------------------------------------