From ad00dfc24c42e4442dbd97172bdc30a9bdfd9f67 Mon Sep 17 00:00:00 2001
From: Petr Duda <petrduda@seznam.cz>
Date: Sat, 23 May 2020 17:33:52 +0200
Subject: [PATCH] Fix #16130 - Local documentation links

Signed-off-by: Petr Duda <petrduda@seznam.cz>
---
 libraries/classes/DatabaseInterface.php |  5 ++---
 libraries/classes/Sanitize.php          |  2 ++
 test/classes/MessageTest.php            | 12 ++++++++++++
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/libraries/classes/DatabaseInterface.php b/libraries/classes/DatabaseInterface.php
index e2a32d516a..179285852d 100644
--- a/libraries/classes/DatabaseInterface.php
+++ b/libraries/classes/DatabaseInterface.php
@@ -3162,11 +3162,10 @@ class DatabaseInterface
         }
 
         if (! self::checkDbExtension('mysqli')) {
-            $docUrl = Util::getDocuLink('faq', 'faqmysql');
             $docLink = sprintf(
                 __('See %sour documentation%s for more information.'),
-                '[a@' . $docUrl . '@documentation]',
-                '[/a]'
+                '[doc@faqmysql]',
+                '[/doc]'
             );
             Core::warnMissingExtension(
                 'mysqli',
diff --git a/libraries/classes/Sanitize.php b/libraries/classes/Sanitize.php
index b989f0d9d7..61c748bebc 100644
--- a/libraries/classes/Sanitize.php
+++ b/libraries/classes/Sanitize.php
@@ -141,9 +141,11 @@ class Sanitize
     public static function replaceDocLink(array $found)
     {
         if (count($found) >= 4) {
+            /* doc@page@anchor pattern */
             $page = $found[1];
             $anchor = $found[3];
         } else {
+            /* doc@anchor pattern */
             $anchor = $found[1];
             if (strncmp('faq', $anchor, 3) == 0) {
                 $page = 'faq';
diff --git a/test/classes/MessageTest.php b/test/classes/MessageTest.php
index 1199f71574..aac4c4926a 100644
--- a/test/classes/MessageTest.php
+++ b/test/classes/MessageTest.php
@@ -428,6 +428,18 @@ class MessageTest extends PmaTestCase
                 . 'latest%2Fsetup.html%23foo" '
                 . 'target="documentation">link</a>',
             ],
+            [
+                '[doc@page@anchor]link[/doc]',
+                '<a href="./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2F'
+                . 'latest%2Fpage.html%23anchor" '
+                . 'target="documentation">link</a>',
+            ],
+            [
+                '[doc@faqmysql]link[/doc]',
+                '<a href="./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2F'
+                . 'latest%2Ffaq.html%23faqmysql" '
+                . 'target="documentation">link</a>',
+            ],
         ];
     }