From 26cca2133d39712cab9cd68ef52ac162a5a0305b Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 1 Apr 2021 18:44:51 +0200 Subject: [PATCH] Add ChangeLog entries for #16604, 700108ba90, 8597ec6814, ec04f6ebac Entry for #16604 already exists Signed-off-by: William Desportes --- ChangeLog | 3 +++ libraries/classes/Display/Results.php | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index d4a344d3b6..e57a316069 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,9 @@ phpMyAdmin - ChangeLog - issue #16765 Fixed new lines in text fields are doubled - issue Fix "Connection" label always shown on table create, should be hidden like it's input - issue #16773 Fix do not use cast as binary for an empty text value on edit button condition +- issue Fixed a JS error on a missing script on zoom search +- issue Added button style on the reset charts of zoom search +- issue Fixed number of rows not kept when changing sort by index value 5.1.0 (2021-02-24) - issue #15350 Change Media (MIME) type references to Media type diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php index fa7063f14c..6265f9205e 100644 --- a/libraries/classes/Display/Results.php +++ b/libraries/classes/Display/Results.php @@ -1269,6 +1269,11 @@ class Results 'sort_by_key' => '1', ]; + // Keep the number of rows (25, 50, 100, ...) when changing sort key value + if (isset($_SESSION['tmpval']) && isset($_SESSION['tmpval']['max_rows'])) { + $hiddenFields['session_max_rows'] = $_SESSION['tmpval']['max_rows']; + } + $isIndexUsed = false; $localOrder = is_array($sortExpression) ? implode(', ', $sortExpression) : '';