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

rahulabs · Sep 14, 2024 · e59b620 · e59b620
2 parents 838fa33 + 4d50915
commit e59b620
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/upload/admin/controller/common/language.php b/upload/admin/controller/common/language.php
@@ -29,7 +29,7 @@ public function index(): string {
 		if (isset($this->request->cookie['language'])) {
 			$data['code'] = $this->request->cookie['language'];
 		} else {
-			$data['code'] = $this->config->get('config_language');
+			$data['code'] = $this->config->get('config_language_admin');
 		}
 
 		// Redirect

diff --git a/upload/catalog/controller/checkout/confirm.php b/upload/catalog/controller/checkout/confirm.php
@@ -299,7 +299,7 @@ public function index(): string {
 					'reward'       => $product['reward']
 				];
 			}
-
+			$this->load->model('checkout/order');
 			if (!isset($this->session->data['order_id'])) {
 				$order_id = $this->model_checkout_order->addOrder($order_data);
 			} else {

diff --git a/upload/system/library/mail/smtp.php b/upload/system/library/mail/smtp.php
@@ -82,6 +82,7 @@ public function send(): bool {
 			$header .= 'Reply-To: =?UTF-8?B?' . base64_encode($this->option['reply_to']) . '?= <' . $this->option['reply_to'] . '>' . PHP_EOL;
 		}
 
+		$header .= 'Message-ID: <' . base_convert(str_replace(['.', ' '], '', microtime()), 10, 36) . '.' . base_convert(bin2hex(openssl_random_pseudo_bytes(8)), 16, 36) . substr($this->option['from'], strrpos($this->option['from'], '@')) . '>' . PHP_EOL;
 		$header .= 'Return-Path: ' . $this->option['from'] . PHP_EOL;
 		$header .= 'X-Mailer: PHP/' . PHP_VERSION . PHP_EOL;
 		$header .= 'Content-Type: multipart/mixed; boundary="' . $boundary . '"' . PHP_EOL . PHP_EOL;