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

This commit is contained in:
Weblate 2014-02-05 14:05:28 +01:00
commit 9ef1e5ce0f
2 changed files with 4 additions and 6 deletions

View File

@ -225,9 +225,6 @@ $response->addHTML(
if (! $tbl_is_view && ! $db_is_information_schema) {
$response->addHTML('<br />');
$response->addHTML(PMA_getHtmlForAddColumn($columns_list));
$response->addHTML(
'<div id="index_div" class="ajax" >'
);
}
/**

View File

@ -1798,9 +1798,7 @@ function getHtmlForRowStatsTable($showtable, $tbl_collation,
);
}
$html_output .= '</tbody>'
. '</table>'
. '</fieldset>'
. '</div>';
. '</table>';
return $html_output;
}
@ -2240,6 +2238,9 @@ function PMA_getHtmlForDisplayTableStats($showtable, $table_info_num_rows,
(isset ($avg_size) ? $avg_size : ''),
(isset ($avg_unit) ? $avg_unit : '')
);
$html_output .= '</fieldset>'
. '</div>';
return $html_output;
}