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

stalker780 · Dec 28, 2024 · 59d1270 · 59d1270
2 parents 416b51a + 1548ba5
commit 59d1270
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/upload/admin/controller/sale/order.php b/upload/admin/controller/sale/order.php
@@ -987,7 +987,7 @@ public function info(): void {
 			$data['order_status_id'] = $this->config->get('config_order_status_id');
 		}
 
-		$data['complete_status'] = in_array($data['order_status_id'], $this->config->get('config_complete_status'));
+		$data['complete_status'] = in_array($data['order_status_id'], (array)$this->config->get('config_complete_status'));
 
 		// Additional tabs that are payment gateway specific
 		$data['tabs'] = [];

diff --git a/upload/catalog/controller/account/register.php b/upload/catalog/controller/account/register.php
@@ -61,7 +61,7 @@ public function index(): void {
 			$customer_groups = $this->model_account_customer_group->getCustomerGroups();
 
 			foreach ($customer_groups as $customer_group) {
-				if (in_array($customer_group['customer_group_id'], $this->config->get('config_customer_group_display'))) {
+				if (in_array($customer_group['customer_group_id'], (array)$this->config->get('config_customer_group_display'))) {
 					$data['customer_groups'][] = $customer_group;
 				}
 			}