Merge #16153 - Fix #16102 - Broken error message

Pull-request: #16153 Fixes: #16102 Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · May 31, 2020 · 8e74c29 · 8e74c29
2 parents 802797c + 37b22a5
commit 8e74c29
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/libraries/classes/Config/FormDisplay.php b/libraries/classes/Config/FormDisplay.php
@@ -824,7 +824,7 @@ public function getDocLink($path)
         return MySQLDocumentation::getDocumentationLink(
             'config',
             'cfg_' . $this->_getOptName($path),
-            Sanitize::isSetup() ? '../' : ''
+            Sanitize::isSetup() ? '../' : './'
         );
     }
 

diff --git a/libraries/classes/Html/MySQLDocumentation.php b/libraries/classes/Html/MySQLDocumentation.php
@@ -82,7 +82,7 @@ public static function showDocumentation($page, $anchor = '', $bbcode = false):
      *
      * @return string URL
      */
-    public static function getDocumentationLink($page, $anchor = '', string $pathPrefix = ''): string
+    public static function getDocumentationLink($page, $anchor = '', string $pathPrefix = './'): string
     {
         /* Construct base URL */
         $url = $page . '.html';

diff --git a/libraries/classes/Sanitize.php b/libraries/classes/Sanitize.php
@@ -153,7 +153,7 @@ public static function replaceDocLink(array $found)
                 $page = 'setup';
             }
         }
-        $link = MySQLDocumentation::getDocumentationLink($page, $anchor, self::isSetup() ? '../' : '');
+        $link = MySQLDocumentation::getDocumentationLink($page, $anchor, self::isSetup() ? '../' : './');
 
         return '<a href="' . $link . '" target="documentation">';
     }