Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3

This commit is contained in:
Madhura Jayaratne 2014-12-10 12:41:22 +05:30
commit 7ee1af4fc6
2 changed files with 5 additions and 1 deletions

View File

@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog
- bug #4628 PHP error while exporting schema as PDF
- bug #4631 Server selector submits two server parameter values
- bug #4629 Problem with custom SQL queries using cookie authentication
- bug Undefined index central_columnswork
4.3.1.0 (2014-12-08)
- bug #4609 'Show all' checkbox label is not clickable

View File

@ -489,7 +489,10 @@ class PMA_Menu
$tabs['designer']['id'] = 'designer_tab';
}
if (! $db_is_system_schema && $cfgRelation['central_columnswork']) {
if (! $db_is_system_schema
&& isset($cfgRelation['central_columnswork'])
&& $cfgRelation['central_columnswork']
) {
$tabs['central_columns']['text'] = __('Central columns');
$tabs['central_columns']['icon'] = 'centralColumns.png';
$tabs['central_columns']['link'] = 'db_central_columns.php';