Merge branch 'QA_4_5'

This commit is contained in:
Madhura Jayaratne 2015-11-02 07:54:32 +11:00
commit ebf4955eb3
2 changed files with 5 additions and 2 deletions

View File

@ -25,6 +25,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

@ -3750,8 +3750,10 @@ function PMA_getHtmlForInitials($array_initials)
null,
PMA\libraries\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