Merge branch 'QA_5_0'

Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · Feb 12, 2020 · ddd46a6 · ddd46a6
2 parents 349a2f1 + 7b81e8f
commit ddd46a6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -57,6 +57,7 @@ phpMyAdmin - ChangeLog
 - issue #15410 Fixed auto increment reset issue where the last value of AI was saved an could destroy the "good" value
 - issue #15187 Fixed editing a row and using 'insert as new row' uses primary key 0 instead of NULL
 - issue #15877 Fixed php error "preg_match() expects parameter 2 to be string, null given" on some specific tables
+- issue #15795 Fix broken link on "MySQL said" error message
 
 5.0.1 (2020-01-07)
 - issue #15719 Fixed error 500 when browsing a table when $cfg['LimitChars'] used a string and not an int value

diff --git a/libraries/classes/Html/Generator.php b/libraries/classes/Html/Generator.php
@@ -1204,7 +1204,7 @@ public static function mysqlDie(
             // Adds a link to MySQL documentation.
             $error_msg .= '<p>' . "\n"
                 . '    <strong>' . __('MySQL said: ') . '</strong>'
-                . MySQLDocumentation::show('Error-messages-server')
+                . MySQLDocumentation::show('server-error-reference')
                 . "\n"
                 . '</p>' . "\n";