Merge branch 'QA_5_2'

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

ChangeLog

@@ -54,6 +54,7 @@ phpMyAdmin - ChangeLog
 - issue #18471 Fix SQL statement not being displayed correctly on RTL languages
 - issue        Fix state times not getting summed in the profiling table
 - issue        Fix a case where a fatal error message was not displayed
+- issue        Fix profiling chart not loading when profiling is activated
 
 5.2.1 (2023-02-07)
 - issue #17522 Fix case where the routes cache file is invalid

libraries/classes/Html/Generator.php

@@ -644,7 +644,7 @@ class Generator
         $retval .= '<div class="card-footer tools d-print-none">' . "\n";
         $retval .= '<div class="row align-items-center">' . "\n";
         $retval .= '<div class="col-auto">' . "\n";
-        $retval .= '<form action="' . Url::getFromRoute('/sql') . '" method="post">' . "\n";
+        $retval .= '<form action="' . Url::getFromRoute('/sql') . '" method="post" class="disableAjax">' . "\n";
         $retval .= Url::getHiddenInputs($GLOBALS['db'], $GLOBALS['table']) . "\n";
         $retval .= '<input type="hidden" name="sql_query" value="'
             . htmlspecialchars($sqlQuery) . '">' . "\n";

package.json

@@ -27,12 +27,12 @@
     "@zxcvbn-ts/core": "^2.2.1",
     "autoprefixer": "^10.4.14",
     "babel-loader": "^9.1.2",
-    "bootstrap": "5.3.0-alpha3",
+    "bootstrap": "5.3.0",
     "chart.js": "^4.2.1",
     "codemirror": "5.65.12",
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^6.6.0",
-    "jquery": "3.6.4",
+    "jquery": "3.7.0",
     "jquery-migrate": "3.4.1",
     "jquery-ui-dist": "1.13.2",
     "jquery-ui-timepicker-addon": "1.6.3",

test/classes/Html/GeneratorTest.php

@@ -494,7 +494,7 @@ SELECT 1;
 <div class="card-footer tools d-print-none">
 <div class="row align-items-center">
 <div class="col-auto">
-<form action="index.php?route=/sql&server=2&lang=en" method="post">
+<form action="index.php?route=/sql&server=2&lang=en" method="post" class="disableAjax">
 <input type="hidden" name="db" value="test_db"><input type="hidden" name="table" value="test_table"><input type="hidden" name="server" value="2"><input type="hidden" name="lang" value="en"><input type="hidden" name="token" value="token">
 <input type="hidden" name="sql_query" value="SELECT 1;">
 <input type="hidden" name="profiling_form" value="1">
@@ -546,7 +546,7 @@ $sql = "EXPLAIN SELECT 1;";
 <div class="card-footer tools d-print-none">
 <div class="row align-items-center">
 <div class="col-auto">
-<form action="index.php?route=/sql&server=2&lang=en" method="post">
+<form action="index.php?route=/sql&server=2&lang=en" method="post" class="disableAjax">
 <input type="hidden" name="db" value="test_db"><input type="hidden" name="table" value="test_table"><input type="hidden" name="server" value="2"><input type="hidden" name="lang" value="en"><input type="hidden" name="token" value="token">
 <input type="hidden" name="sql_query" value="EXPLAIN SELECT 1;">
 </form></div>