Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5

This commit is contained in:
Weblate 2015-11-01 21:49:01 +01:00
commit c309cec3e8
2 changed files with 5 additions and 2 deletions

View File

@ -14,6 +14,7 @@ phpMyAdmin - ChangeLog
- issue #11605 Changing hostname kills password
- issue #11614 Undefined variable: db
- issue #11627 CREATE TABLE/INSERT INTO executed twice (ctrl+enter)
- issue #11630 Warning: mysqli_fetch_array() expects parameter 1 to be mysqli_result, boolean given
4.5.1.0 (2015-10-23)
- issue Invalid argument supplied for foreach()

View File

@ -3708,8 +3708,10 @@ function PMA_getHtmlForInitials($array_initials)
null,
PMA_DatabaseInterface::QUERY_STORE
);
while (list($tmp_initial) = $GLOBALS['dbi']->fetchRow($initials)) {
$array_initials[$tmp_initial] = true;
if ($initials) {
while (list($tmp_initial) = $GLOBALS['dbi']->fetchRow($initials)) {
$array_initials[$tmp_initial] = true;
}
}
// Display the initials, which can be any characters, not