From acbf4766b5c257b182c206b8a03288708c95ee52 Mon Sep 17 00:00:00 2001
From: WxAmd <15729498+wxfjamdc@users.noreply.github.com>
Date: Fri, 17 Nov 2023 09:23:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20admin=5Furl=20secure=20?=
 =?UTF-8?q?=E5=A7=8B=E7=BB=88=E4=B8=8D=E4=B8=BAnull?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/admin.php        | 2 +-
 src/Support/helpers.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/admin.php b/config/admin.php
index aa287af0c..a68e74326 100755
--- a/config/admin.php
+++ b/config/admin.php
@@ -114,7 +114,7 @@
     | If your page is going to be accessed via https, set it to `true`.
     |
     */
-    'https' => env('ADMIN_HTTPS', false),
+    'https' => env('ADMIN_HTTPS'),
 
     /*
     |--------------------------------------------------------------------------
diff --git a/src/Support/helpers.php b/src/Support/helpers.php
index 7c17986ef..8257ba77d 100755
--- a/src/Support/helpers.php
+++ b/src/Support/helpers.php
@@ -267,7 +267,7 @@ function admin_url($path = '', $parameters = [], $secure = null)
             return $path;
         }
 
-        $secure = $secure ?: (config('admin.https') || config('admin.secure'));
+        $secure = $secure ?: config('admin.https') ?: config('admin.secure');
 
         return url(admin_base_path($path), $parameters, $secure);
     }