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

This commit is contained in:
Weblate 2014-01-14 12:14:16 +01:00
commit b17c250aba
2 changed files with 4 additions and 1 deletions

View File

@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog
- bug #4224 Empty table names when a table is "inuse"
- bug #4225 Partition maintenance broken
- bug #4219 Table list (left panel) does not reload when table renamed
- bug #4230 "in use" displayed for all views in database print view
4.1.4.0 (2014-01-07)
- bug #3840 (additional fix) When exporting to gzip format, the data is compressed 2 times

View File

@ -94,7 +94,9 @@ if ($num_tables == 0) {
} // end if
} else {
echo '<td colspan="3" class="center">';
echo __('in use');
if (! PMA_Table::isView($db, $sts_data['TABLE_NAME'])) {
echo __('in use');
}
echo '</td>';
}
echo '<td>';