Escape : also in remove_from_param

diff --git a/adminer/include/bootstrap.inc.php b/adminer/include/bootstrap.inc.php
index 621ec4653a3d61a015ba5fc692718f7e7cc3f106..6a56945d652dcaf54ebfddcc53708a2352dcdbc7 100644 (file)
--- a/adminer/include/bootstrap.inc.php
+++ b/adminer/include/bootstrap.inc.php
@@ -84,7 +84,7 @@ include "../adminer/drivers/mysql.inc.php"; // must be included as last driver
 
 define("SERVER", $_GET[DRIVER]); // read from pgsql=localhost
 define("DB", $_GET["db"]); // for the sake of speed and size
-define("ME", str_replace(":", "%3a", preg_replace('~\?.*~', '', relative_uri())) . '?'
+define("ME", preg_replace('~\?.*~', '', relative_uri()) . '?'
        . (sid() ? SID . '&' : '')
        . (SERVER !== null ? DRIVER . "=" . urlencode(SERVER) . '&' : '')
        . (isset($_GET["username"]) ? "username=" . urlencode($_GET["username"]) . '&' : '')

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index adcf1fbd267ebffd4b6dff143404c78c78b170c9..4eba85c8811e135ffc62200119d36c1ad3905f4f 100644 (file)
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -725,7 +725,7 @@ function format_time($start) {
 * @return string
 */
 function relative_uri() {
-       return preg_replace('~^[^?]*/([^?]*)~', '\1', $_SERVER["REQUEST_URI"]);
+       return str_replace(":", "%3a", preg_replace('~^[^?]*/([^?]*)~', '\1', $_SERVER["REQUEST_URI"]));
 }
 
 /** Remove parameter from query string

diff --git a/adminer/include/version.inc.php b/adminer/include/version.inc.php
index 853359abfa4ac52b75fc59210c4a6b1ba24dbc8a..809cc99890954ed68331e1896670937703b841b5 100644 (file)
--- a/adminer/include/version.inc.php
+++ b/adminer/include/version.inc.php
@@ -1,2 +1,2 @@
 <?php
-$VERSION = "4.7.7";
+$VERSION = "4.7.8-dev";

diff --git a/changes.txt b/changes.txt
index e250334372425dfebbef8aa8d8b3531efcbf5e37..14f4cb98923fa4572a509ad096f18e743a1f1966 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -1,3 +1,5 @@
+Adminer 4.7.8-dev:
+
 Adminer 4.7.7 (released 2020-05-11):
 Fix open redirect if Adminer is accessible at //adminer.php%2F@