Merge pull request cakephp#728 from cakephp/double-wrap-transport

Don't double wrap transports
davidspeijer · Jan 16, 2020 · 5680528 · 5680528
2 parents 20f2260 + c08193b
commit 5680528
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/Panel/MailPanel.php b/src/Panel/MailPanel.php
@@ -47,21 +47,24 @@ public function initialize()
 
         $log = $this->emailLog = new ArrayObject();
 
-        foreach ($configs as $name => &$transport) {
+        foreach ($configs as $name => $transport) {
             if (is_object($transport)) {
-                $configs[$name] = new DebugKitTransport(['debugKitLog' => $log], $transport);
+                if (!$transport instanceof DebugKitTransport) {
+                    $configs[$name] = new DebugKitTransport(['debugKitLog' => $log], $transport);
+                }
                 continue;
             }
 
             $className = App::className($transport['className'], 'Mailer/Transport', 'Transport');
-
-            if (!$className) {
+            if (!$className || $className === DebugKitTransport::class) {
                 continue;
             }
 
             $transport['originalClassName'] = $transport['className'];
             $transport['className'] = 'DebugKit.DebugKit';
             $transport['debugKitLog'] = $log;
+
+            $configs[$name] = $transport;
         }
         $property->setValue($configs);
     }