Merge branch 'QA_5_0'

Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2020-05-19 00:04:22 +02:00
commit 73290bcdcf
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
3 changed files with 3 additions and 2 deletions

View File

@ -57,6 +57,7 @@ phpMyAdmin - ChangeLog
- issue Fix typo in a condition in the Sql class
- issue #15996 Fix local setup doc links pointing to a wrong location
- issue #16093 Fix error importing utf-8 with bom sql file
- issue #16089 2FA UX enhancement: autofocus 2FA input
5.0.2 (2020-03-20)
- issue Fixed deprecation warning "implode(): Passing glue string after array is deprecated." function on export page

View File

@ -814,7 +814,7 @@ class FormDisplay
return MySQLDocumentation::getDocumentationLink(
'config',
'cfg_' . $this->_getOptName($path),
'../'
Sanitize::isSetup() ? '../' : ''
);
}

View File

@ -83,7 +83,7 @@ class Sanitize
*
* @return bool
*/
private static function isSetup(): bool
public static function isSetup(): bool
{
return $GLOBALS['PMA_Config'] !== null && $GLOBALS['PMA_Config']->get('is_setup');
}