From ed66452e66b052e10b6056d2aa4ffca58f30efb2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 12 Sep 2019 16:49:00 +0200 Subject: - update to 5.0.0alpha1 - raise dependency on PHP 7.1.3 - raise dependency on phpmyadmin/sql-parser 5.0 - raise dependency on twig 2.1 - add dependency on pragmarx/google2fa-qrcode - drop dependency on pragmarx/google2fa and bacon/bacon-qr-code - drop dependency on psr/container --- 5b67d2189cd930ceb4e72da737dbd267b781daf9.patch | 28 ++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 5b67d2189cd930ceb4e72da737dbd267b781daf9.patch (limited to '5b67d2189cd930ceb4e72da737dbd267b781daf9.patch') diff --git a/5b67d2189cd930ceb4e72da737dbd267b781daf9.patch b/5b67d2189cd930ceb4e72da737dbd267b781daf9.patch new file mode 100644 index 0000000..44a8747 --- /dev/null +++ b/5b67d2189cd930ceb4e72da737dbd267b781daf9.patch @@ -0,0 +1,28 @@ +From 5b67d2189cd930ceb4e72da737dbd267b781daf9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= +Date: Wed, 10 Jul 2019 17:00:43 -0300 +Subject: [PATCH] Fix wrong path when getting documentation link +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes #15381 + +Signed-off-by: Maurício Meneghini Fauth +--- + libraries/classes/Util.php | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php +index b488c26fbad..fa115dd6429 100644 +--- a/libraries/classes/Util.php ++++ b/libraries/classes/Util.php +@@ -460,7 +460,7 @@ public static function getDocuLink($page, $anchor = '') + * provide consistent URL for testsuite + */ + if (! defined('TESTSUITE') && @file_exists(ROOT_PATH . 'doc/html/index.html')) { +- return ROOT_PATH . 'doc/html/' . $url; ++ return 'doc/html/' . $url; + } + + return Core::linkURL('https://docs.phpmyadmin.net/en/latest/' . $url); -- cgit