Merge branch 'QA_5_2'

Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · Nov 20, 2022 · 1df4115 · 1df4115
2 parents 49e4cc1 + c411d0f
commit 1df4115
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 12 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -65,6 +65,7 @@ phpMyAdmin - ChangeLog
 - issue #17606 Fix preview SQL modal not working inside "Add Index" modal
 - issue        Fix PHP error on adding new column on create table form
 - issue #17482 Default to "Full texts" when running explain statements
+- issue        Fixed Chrome scrolling performance issue on a textarea of an "export as text" page
 
 5.2.0 (2022-05-10)
 - issue #16521 Upgrade Bootstrap to version 5

diff --git a/composer.json b/composer.json
@@ -61,7 +61,7 @@
         "nikic/fast-route": "^1.3",
         "phpmyadmin/motranslator": "^5.0",
         "phpmyadmin/shapefile": "^3.0.1",
-        "phpmyadmin/sql-parser": "dev-master#8fddb4becdfb657db3b9ade52e952ef3c822a26b",
+        "phpmyadmin/sql-parser": "dev-master#bb49d475e58b4082e63ed91a92ce955c9c20b058",
         "phpmyadmin/twig-i18n-extension": "^4.0",
         "psr/http-factory": "^1.0",
         "psr/http-message": "^1.0",

diff --git a/js/src/navigation.js b/js/src/navigation.js
@@ -412,34 +412,34 @@ Navigation.onload = () => function () {
     /**
      * Bind all "fast filter" events
      */
-    $(document).on('click', '#pma_navigation_tree li.fast_filter button.searchClauseClear', Navigation.FastFilter.events.clear);
-    $(document).on('focus', '#pma_navigation_tree li.fast_filter input.searchClause', Navigation.FastFilter.events.focus);
-    $(document).on('blur', '#pma_navigation_tree li.fast_filter input.searchClause', Navigation.FastFilter.events.blur);
-    $(document).on('keyup', '#pma_navigation_tree li.fast_filter input.searchClause', Navigation.FastFilter.events.keyup);
+    $('#pma_navigation_tree').on('click', 'li.fast_filter button.searchClauseClear', Navigation.FastFilter.events.clear);
+    $('#pma_navigation_tree').on('focus', 'li.fast_filter input.searchClause', Navigation.FastFilter.events.focus);
+    $('#pma_navigation_tree').on('blur', 'li.fast_filter input.searchClause', Navigation.FastFilter.events.blur);
+    $('#pma_navigation_tree').on('keyup', 'li.fast_filter input.searchClause', Navigation.FastFilter.events.keyup);
 
     /**
      * Ajax handler for pagination
      */
-    $(document).on('click', '#pma_navigation_tree div.pageselector a.ajax', function (event) {
+    $('#pma_navigation_tree').on('click', 'div.pageselector a.ajax', function (event) {
         event.preventDefault();
         Navigation.treePagination($(this));
     });
 
     /**
      * Node highlighting
      */
-    $(document).on(
+    $('#pma_navigation_tree.highlight').on(
         'mouseover',
-        '#pma_navigation_tree.highlight li:not(.fast_filter)',
+        'li:not(.fast_filter)',
         function () {
             if ($('li:visible', this).length === 0) {
                 $(this).addClass('activePointer');
             }
         }
     );
-    $(document).on(
+    $('#pma_navigation_tree.highlight').on(
         'mouseout',
-        '#pma_navigation_tree.highlight li:not(.fast_filter)',
+        'li:not(.fast_filter)',
         function () {
             $(this).removeClass('activePointer');
         }

diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php
@@ -4129,6 +4129,13 @@ private function getFromForeign(array $fieldInfo, string $whereComparison): ?str
             return __('Link not found!');
         }
 
+        if ($dispval === null) {
+            return null;
+        }
+
+        // Truncate values that are too long, see: #17902
+        [,$dispval] = $this->getPartialText($dispval);
+
         return $dispval;
     }
 

diff --git a/libraries/config.default.php b/libraries/config.default.php
@@ -189,7 +189,7 @@
 
 /**
  * MySQL 5.6 or later triggers the mysqlnd driver in PHP to validate the
- * peer_name of the SSL certifcate
+ * peer_name of the SSL certificate
  * For most self-signed certificates this is a problem. Setting this to false
  * will disable the check and allow the connection (PHP 5.6.16 or later)
  *
@@ -2857,7 +2857,7 @@
  * is replaced by form with button.
  * This is required as some web servers (IIS) have problems with long URLs.
  * The recommended limit is 2000
- * (see https://www.boutell.com/newfaq/misc/urllength.html) but we put
+ * (see https://stackoverflow.com/a/417184/5155484) but we put
  * 1000 to accommodate Suhosin, see bug #3358750.
  */
 $cfg['LinkLengthLimit'] = 1000;