Merge pull request #9449 from ddevsr/patch-3

refactor: get upper first protocol only one call in Email
2025-02-20 11:44:28 +08:00 · 2025-02-13 00:18:04 +07:00 · 2025-02-13 00:18:04 +07:00 · 57a8859d09
commit 57a8859d09
parent f4213aba00 d2bf2099e2
1 changed files with 4 additions and 3 deletions
--- a/system/Email/Email.php
+++ b/system/Email/Email.php
@ -1689,8 +1689,9 @@ class Email
    protected function spoolEmail()
    {
        $this->unwrapSpecials();
-        $protocol = $this->getProtocol();
-        $method   = 'sendWith' . ucfirst($protocol);
+        $protocol           = $this->getProtocol();
+        $upperFirstProtocol = ucfirst($protocol);
+        $method             = 'sendWith' . $upperFirstProtocol;

        try {
            $success = $this->{$method}();
@ -1700,7 +1701,7 @@ class Email
        }

        if (! $success) {
-            $message = lang('Email.sendFailure' . ($protocol === 'mail' ? 'PHPMail' : ucfirst($protocol)));
+            $message = lang('Email.sendFailure' . ($protocol === 'mail' ? 'PHPMail' : $upperFirstProtocol));

            log_message('error', 'Email: ' . $message);
            log_message('error', $this->printDebuggerRaw());