Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2013-07-10 16:14:28 +02:00
commit c03c809793

View File

@ -1191,11 +1191,7 @@ function PMA_getHtmlForTableStructureHeader(
if (PMA_DRIZZLE) {
$colspan -= 2;
}
if (in_array(
$GLOBALS['cfg']['ActionLinksMode'],
array('icons', 'both')
)
) {
if (in_array($GLOBALS['cfg']['ActionLinksMode'], array('icons', 'both'))) {
$colspan--;
}
$html_output .= '<th colspan="' . $colspan . '" '