Merge branch 'QA_4_7'

ChangeLog

@@ -20,6 +20,7 @@ phpMyAdmin - ChangeLog
 - issue #13146 Do not include devel dependencies in the release
 - issue #13144 Do not show New as a database in database dropdown
 - issue #13130 Fixed handling of errors in AJAX requests
+- issue #13152 Fixed PHP error in case of invalid table preferences
 
 4.7.0 (2017-03-28)
 - patch #12233 [Display] Improve message when renaming database to same name

libraries/Table.php

@@ -1849,7 +1849,7 @@ class Table
             // check if the table has not been modified
             if ($this->getStatusInfo('Create_time') == $this->uiprefs['CREATE_TIME']
             ) {
-                return $this->uiprefs[$property];
+                return array_map('intval', $this->uiprefs[$property]);
             }
 
             // remove the property, since the table has been modified

libraries/sql.lib.php

@@ -712,7 +712,7 @@ function PMA_hasNoRightsToDropDatabase($analyzed_sql_results,
  */
 function PMA_setColumnProperty($pmatable, $request_index)
 {
-    $property_value = explode(',', $_REQUEST[$request_index]);
+    $property_value = array_map('intval', explode(',', $_REQUEST[$request_index]));
     switch($request_index) {
     case 'col_order':
         $property_to_set = Table::PROP_COLUMN_ORDER;