From 4e2a448e28fe1ba1fecfa8375fbc940a7a494105 Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakub@vrana.cz>
Date: Mon, 11 May 2020 12:35:19 +0200
Subject: [PATCH] Escape : also in remove_from_param

---
 adminer/include/bootstrap.inc.php | 2 +-
 adminer/include/functions.inc.php | 2 +-
 adminer/include/version.inc.php   | 2 +-
 changes.txt                       | 2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/adminer/include/bootstrap.inc.php b/adminer/include/bootstrap.inc.php
index 621ec465..6a56945d 100644
--- 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 adcf1fbd..4eba85c8 100644
--- 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 853359ab..809cc998 100644
--- 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 e2503343..14f4cb98 100644
--- 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@