Merge pull request #982 from cakephp/4.x

merge 4.x -> 4.next
cakephp · Dec 26, 2023 · 7a2ccef · 7a2ccef
2 parents 92cbfa9 + 49c841e
commit 7a2ccef
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/Panel/MailPanel.php b/src/Panel/MailPanel.php
@@ -67,7 +67,7 @@ public function initialize()
 
             $configs[$name] = $transport;
         }
-        $property->setValue($configs);
+        $reflection->setStaticPropertyValue('_config', $configs);
     }
 
     /**

diff --git a/webroot/js/modules/Panels/VariablesPanel.js b/webroot/js/modules/Panels/VariablesPanel.js
@@ -6,7 +6,7 @@ export default (($) => {
       } else {
         document.cookie = `debugKit_sort=1; path=${window.debugKitWebroot}`;
       }
-      toolbar.loadPanel(toolbar.currentPanel(), 'panelvariables');
+      toolbar.loadPanel(toolbar.currentPanel(), 'variables');
     });
   }
 

diff --git a/webroot/js/modules/Toolbar.js b/webroot/js/modules/Toolbar.js
@@ -182,7 +182,7 @@ export default class Toolbar {
     });
     $(document).on('click', '.js-toolbar-load-panel', function () {
       const panelId = $(this).attr('data-panel-id');
-      that.loadPanel(panelId, 'panelhistory');
+      that.loadPanel(panelId, 'history');
     });
     $(document).on('click', '.js-panel-close', () => {
       that.hide();
-Original file line number
+Diff line change
@@ Expand Up / @@ -67,7 +67,7 @@ public function initialize() @@
                 $configs[$name] = $transport;
             }
-            $property->setValue($configs);
+            $reflection->setStaticPropertyValue('_config', $configs);
         }
         /**
@@ Expand Down @@