Merge branch 'QA_4_4' into QA_4_5

ChangeLog

@@ -119,6 +119,7 @@ phpMyAdmin - ChangeLog
 - issue #11457 Request URI too large
 - issue        Invalid argument supplied for foreach()
 - issue #11461 Foreign key constraints for InnoDB tables with upper-case letters disabled
+- issue #11487 Warning when entering Query page
 
 4.4.14.1 (2015-09-08)
 - issue        [security] reCaptcha bypass

libraries/DatabaseInterface.class.php

@@ -1528,16 +1528,16 @@ public function getColumnsSql($database, $table, $column = null, $full = false)
      * @param boolean $full     whether to return full info or only column names
      * @param mixed   $link     mysql link resource
      *
-     * @return false|array   array indexed by column names or,
-     *                        if $column is given, flat array description
+     * @return array array indexed by column names or,
+     *               if $column is given, flat array description
      */
     public function getColumns($database, $table, $column = null, $full = false,
         $link = null
     ) {
         $sql = $this->getColumnsSql($database, $table, $column, $full);
         $fields = $this->fetchResult($sql, 'Field', null, $link);
         if (! is_array($fields) || count($fields) == 0) {
-            return null;
+            return array();
         }
         // Check if column is a part of multiple-column index and set its 'Key'.
         $indexes = PMA_Index::getFromTable($table, $database);