修复 admin_url secure 始终不为null

jqhph · Nov 17, 2023 · acbf476 · acbf476
1 parent fc93239
commit acbf476
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);
     }