From 8e8b7df45000e04770e69ce20745238a33fbc166 Mon Sep 17 00:00:00 2001
From: Saksham Gupta <shucon01@gmail.com>
Date: Wed, 27 Jan 2021 15:38:41 +0530
Subject: [PATCH] Fixes: https://github.com/phpmyadmin/phpmyadmin/issues/15389

Signed-off-by: Saksham Gupta <shucon01@gmail.com>

Add Unit Test

Signed-off-by: Saksham Gupta <shucon01@gmail.com>

Fix Lint

Signed-off-by: Saksham Gupta <shucon01@gmail.com>

Add comment

Signed-off-by: Saksham Gupta <shucon01@gmail.com>
---
 libraries/classes/Util.php | 4 ++++
 test/classes/UtilTest.php  | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php
index 290f017b6c..a7756e44b7 100644
--- a/libraries/classes/Util.php
+++ b/libraries/classes/Util.php
@@ -1297,6 +1297,10 @@ class Util
             $pages = array_unique($pages);
         }
 
+        if ($pageNow > $nbTotalPage) {
+            $pages[] = $pageNow;
+        }
+
         foreach ($pages as $i) {
             if ($i == $pageNow) {
                 $selected = 'selected="selected" style="font-weight: bold"';
diff --git a/test/classes/UtilTest.php b/test/classes/UtilTest.php
index a04c9db6e5..399d145fd7 100644
--- a/test/classes/UtilTest.php
+++ b/test/classes/UtilTest.php
@@ -372,6 +372,12 @@ class UtilTest extends AbstractTestCase
             '<select class="pageselector ajax" name="pma" >',
             Util::pageselector('pma', 3)
         );
+
+        // If pageNow > nbTotalPage, show the pageNow number to avoid confusion
+        $this->assertStringContainsString(
+            '<option selected="selected" style="font-weight: bold" value="297">100</option>',
+            Util::pageselector('pma', 3, 100, 50)
+        );
     }
 
     /**