Merge remote-tracking branch 'origin/master'

This commit is contained in:
Pootle server 2011-08-03 18:40:15 +02:00
commit 3ff348b752

View File

@ -277,7 +277,7 @@ function PMA__getRelationsParam()
$cfgRelation['displaywork'] = true;
}
}
if (isset($cfgRelation['table_coords']) && isset($cfgRelation['pdf_pages'])) {
$cfgRelation['pdfwork'] = true;
}
@ -513,7 +513,7 @@ function PMA_getComments($db, $table = '')
if ($table != '') {
// MySQL native column comments
$fields = PMA_DBI_get_columns($db, $table);
$fields = PMA_DBI_get_columns($db, $table, true);
if ($fields) {
foreach ($fields as $field) {
if (! empty($field['Comment'])) {