Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-04-10 20:01:01 +02:00
commit 03f943ed38

View File

@ -135,11 +135,13 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) {
);
}
// Variable tell if current column is bound in a foreign key constraint or not.
$columnMeta['column_status'] = PMA_checkChildForeignReferences(
$_form_params['db'],
$_form_params['table'],
isset($columnMeta) ? $columnMeta['Field'] : null
);
if (isset($columnMeta['Field']) && isset($_form_params['table'])) {
$columnMeta['column_status'] = PMA_checkChildForeignReferences(
$_form_params['db'],
$_form_params['table'],
$columnMeta['Field']
);
}
$content_cells[$columnNumber] = PMA_getHtmlForColumnAttributes(
$columnNumber, isset($columnMeta) ? $columnMeta : null, strtoupper($type),