From dcf434b635a60ff69bf84754221d6dfb85338e83 Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Thu, 21 Jun 2018 14:00:03 -0400 Subject: [PATCH] Fixup from merge Signed-off-by: Isaac Bennetch --- libraries/classes/Core.php | 2 -- test/classes/CoreTest.php | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/libraries/classes/Core.php b/libraries/classes/Core.php index 7d2f2bab53..0a1192059a 100644 --- a/libraries/classes/Core.php +++ b/libraries/classes/Core.php @@ -438,8 +438,6 @@ class Core } // end getRealSize() /** - * boolean phpMyAdmin.Core::checkPageValidity(string &$page, array $whitelist, boolean $include) - * * Checks given $page against given $whitelist and returns true if valid * it optionally ignores query parameters in $page (script.php?ignored) * diff --git a/test/classes/CoreTest.php b/test/classes/CoreTest.php index 90fe9c4b0f..4305dc9da7 100644 --- a/test/classes/CoreTest.php +++ b/test/classes/CoreTest.php @@ -294,7 +294,7 @@ class CoreTest extends PmaTestCase ['index.php?sql.php&test=true', $this->goto_whitelist, true, false], ['index.php%3Fsql.php%26test%3Dtrue', $this->goto_whitelist, false, true], ['index.php%3Fsql.php%26test%3Dtrue', $this->goto_whitelist, true, false], - ]; + ]; } /**