Merge branch 'QA_3_3'

This commit is contained in:
Marc Delisle
2011-01-03 08:03:41 -05:00
2 changed files with 12 additions and 2 deletions

View File

@@ -355,8 +355,16 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals
} else {
// Prepare to sort by creating array of the selected sort
// value to pass to array_multisort
foreach ($each_tables as $table_name => $table_data) {
${$sort_by}[$table_name] = strtolower($table_data[$sort_by]);
// Size = Data_length + Index_length
if ($sort_by == 'Data_length') {
foreach ($each_tables as $table_name => $table_data) {
${$sort_by}[$table_name] = strtolower($table_data['Data_length'] + $table_data['Index_length']);
}
} else {
foreach ($each_tables as $table_name => $table_data) {
${$sort_by}[$table_name] = strtolower($table_data[$sort_by]);
}
}
if ($sort_order == 'DESC') {