Merge remote-tracking branch 'origin/master'

This commit is contained in:
tyron 2011-05-24 18:31:22 +02:00
commit c6c0b451a7
2 changed files with 3 additions and 3 deletions

View File

@ -18,6 +18,7 @@
- bug #3305883 [interface] Table is dropped regardless of confirmation
- [auth] Fixed error handling for signon auth method.
- bug #3276001 [core] Avoid caching of index.php.
- bug #3306958 [interface] Unnecessary Details slider
3.4.1.0 (2011-05-20)
- bug #3301108 [interface] Synchronize and already configured host

View File

@ -700,14 +700,13 @@ if (! $tbl_is_view && ! $db_is_information_schema && 'ARCHIVE' != $tbl_type) {
<?php
}
PMA_generate_slider_effect('tablestatistics', __('Details...'));
/**
* Displays Space usage and row statistics
*/
// BEGIN - Calc Table Space
// Get valid statistics whatever is the table type
if ($cfg['ShowStats']) {
echo '<div id="tablestatistics">';
if (empty($showtable)) {
$showtable = PMA_Table::sGetStatusInfo($GLOBALS['db'], $GLOBALS['table'], null, true);
}
@ -926,7 +925,7 @@ if ($cfg['ShowStats']) {
</tbody>
</table>
<!-- close slider div -->
<!-- close tablestatistics div -->
</div>
<?php