From bdb36da1f7a9bddc07f98c700fe70b2432abca29 Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@opencart.cn>
Date: Thu, 4 Aug 2022 16:10:33 +0800
Subject: [PATCH] fixed admin language

---
 app/Http/Middleware/ShareViewData.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Middleware/ShareViewData.php b/app/Http/Middleware/ShareViewData.php
index d9be7356..fa4cff58 100644
--- a/app/Http/Middleware/ShareViewData.php
+++ b/app/Http/Middleware/ShareViewData.php
@@ -34,7 +34,7 @@ class ShareViewData
 
         if (is_admin()) {
             $adminLanguages = $this->handleAdminLanguages();
-            $currentLanguage = current_user()->locale ?? 'en';
+            $currentLanguage = current_user()->locale ?: 'en';
             View::share('admin_languages', $adminLanguages);
             View::share('admin_language', collect($adminLanguages)->where('code', $currentLanguage)->first());
         }