From cdc86bbe47bc528f50712436428fb73fdceeeac8 Mon Sep 17 00:00:00 2001
From: xboard <xboard@xboard.one>
Date: Mon, 1 Jan 2024 01:06:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=82=AE=E7=AE=B1?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=97=A0=E6=B3=95=E4=BB=8E=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E8=AF=BB=E5=8F=96=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Helpers/Functions.php |  2 +-
 app/Jobs/SendEmailJob.php | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/Helpers/Functions.php b/app/Helpers/Functions.php
index bee96cb..7447162 100644
--- a/app/Helpers/Functions.php
+++ b/app/Helpers/Functions.php
@@ -28,6 +28,6 @@ if (! function_exists('admin_setting')) {
             return;
         }
         $default = config('v2board.'. $key) ?? $default;
-        return app('setting')->get($key, $default) ;
+        return app('setting')->get($key) ?? $default ;
     }
 }
diff --git a/app/Jobs/SendEmailJob.php b/app/Jobs/SendEmailJob.php
index 48bbf0b..9a9f174 100644
--- a/app/Jobs/SendEmailJob.php
+++ b/app/Jobs/SendEmailJob.php
@@ -37,12 +37,12 @@ class SendEmailJob implements ShouldQueue
     public function handle()
     {
         if (admin_setting('email_host')) {
-            Config::set('mail.host', admin_setting('email_host', env('mail.host')));
-            Config::set('mail.port', admin_setting('email_port', env('mail.port')));
-            Config::set('mail.encryption', admin_setting('email_encryption', env('mail.encryption')));
-            Config::set('mail.username', admin_setting('email_username', env('mail.username')));
-            Config::set('mail.password', admin_setting('email_password', env('mail.password')));
-            Config::set('mail.from.address', admin_setting('email_from_address', env('mail.from.address')));
+            Config::set('mail.host', admin_setting('email_host', config('mail.host')));
+            Config::set('mail.port', admin_setting('email_port', config('mail.port')));
+            Config::set('mail.encryption', admin_setting('email_encryption', config('mail.encryption')));
+            Config::set('mail.username', admin_setting('email_username', config('mail.username')));
+            Config::set('mail.password', admin_setting('email_password', config('mail.password')));
+            Config::set('mail.from.address', admin_setting('email_from_address', config('mail.from.address')));
             Config::set('mail.from.name', admin_setting('app_name', 'XBoard'));
         }
         $params = $this->params;