https://github.com/opencart/opencart/issues/14263

rahulabs · Dec 11, 2024 · 7cc73a6 · 7cc73a6
1 parent b875eb5
commit 7cc73a6
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 9 deletions.
diff --git a/upload/admin/controller/catalog/category.php b/upload/admin/controller/catalog/category.php
@@ -332,7 +332,11 @@ public function form(): void {
 
 		$this->load->model('setting/store');
 
-		$data['stores'] = $data['stores'] + $this->model_setting_store->getStores();
+		$results = $this->model_setting_store->getStores();
+
+		foreach ($results as $result) {
+			$data['stores'][] = $result;
+		}
 
 		if (isset($this->request->get['category_id'])) {
 			$data['category_store'] = $this->model_catalog_category->getStores($this->request->get['category_id']);

diff --git a/upload/admin/controller/catalog/information.php b/upload/admin/controller/catalog/information.php
@@ -237,7 +237,11 @@ public function form(): void {
 
 		$this->load->model('setting/store');
 
-		$data['stores'] = $data['stores'] + $this->model_setting_store->getStores();
+		$results = $this->model_setting_store->getStores();
+
+		foreach ($results as $result) {
+			$data['stores'][] = $result;
+		}
 
 		if (isset($this->request->get['information_id'])) {
 			$data['information_store'] = $this->model_catalog_information->getStores($this->request->get['information_id']);

diff --git a/upload/admin/controller/catalog/manufacturer.php b/upload/admin/controller/catalog/manufacturer.php
@@ -230,7 +230,11 @@ public function form(): void {
 
 		$this->load->model('setting/store');
 
-		$data['stores'] = $data['stores'] + $this->model_setting_store->getStores();
+		$results = $this->model_setting_store->getStores();
+
+		foreach ($results as $result) {
+			$data['stores'][] = $result;
+		}
 
 		if (isset($this->request->get['manufacturer_id'])) {
 			$data['manufacturer_store'] = $this->model_catalog_manufacturer->getStores($this->request->get['manufacturer_id']);

diff --git a/upload/admin/controller/catalog/product.php b/upload/admin/controller/catalog/product.php
@@ -898,7 +898,11 @@ public function form(): void {
 
 		$this->load->model('setting/store');
 
-		$data['stores'] = $data['stores'] + $this->model_setting_store->getStores();
+		$results = $this->model_setting_store->getStores();
+
+		foreach ($results as $result) {
+			$data['stores'][] = $result;
+		}
 
 		if ($product_id) {
 			$data['product_store'] = $this->model_catalog_product->getStores($product_id);

diff --git a/upload/admin/controller/cms/article.php b/upload/admin/controller/cms/article.php
@@ -273,7 +273,11 @@ public function form(): void {
 
 		$this->load->model('setting/store');
 
-		$data['stores'] = $data['stores'] + $this->model_setting_store->getStores();
+		$results = $this->model_setting_store->getStores();
+
+		foreach ($results as $result) {
+			$data['stores'][] = $result;
+		}
 
 		if (isset($this->request->get['article_id'])) {
 			$data['article_store'] = $this->model_cms_article->getStores($this->request->get['article_id']);

diff --git a/upload/admin/controller/cms/topic.php b/upload/admin/controller/cms/topic.php
@@ -251,7 +251,11 @@ public function form(): void {
 
 		$this->load->model('setting/store');
 
-		$data['stores'] = $data['stores'] + $this->model_setting_store->getStores();
+		$results = $this->model_setting_store->getStores();
+
+		foreach ($results as $result) {
+			$data['stores'][] = $result;
+		}
 
 		if (isset($this->request->get['topic_id'])) {
 			$data['topic_store'] = $this->model_cms_topic->getStores($this->request->get['topic_id']);

diff --git a/upload/admin/controller/sale/order.php b/upload/admin/controller/sale/order.php
@@ -148,7 +148,11 @@ public function index(): void {
 
 		$this->load->model('setting/store');
 
-		$data['stores'] = $data['stores'] + $this->model_setting_store->getStores();
+		$results = $this->model_setting_store->getStores();
+
+		foreach ($results as $result) {
+			$data['stores'][] = $result;
+		}
 
 		$this->load->model('localisation/order_status');
 
@@ -666,7 +670,11 @@ public function info(): void {
 
 		$this->load->model('setting/store');
 
-		$data['stores'] = $data['stores'] + $this->model_setting_store->getStores();
+		$results = $this->model_setting_store->getStores();
+
+		foreach ($results as $result) {
+			$data['stores'][] = $result;
+		}
 
 		if (!empty($order_info)) {
 			$data['store_id'] = $order_info['store_id'];

diff --git a/upload/admin/controller/sale/subscription.php b/upload/admin/controller/sale/subscription.php
@@ -512,7 +512,11 @@ public function info(): void {
 
 		$this->load->model('setting/store');
 
-		$data['stores'] = $data['stores'] + $this->model_setting_store->getStores();
+		$results = $this->model_setting_store->getStores();
+
+		foreach ($results as $result) {
+			$data['stores'][] = $result;
+		}
 
 		if (!empty($subscription_info)) {
 			$data['store_id'] = $subscription_info['store_id'];