Merge branch 'QA_4_3'

This commit is contained in:
Marc Delisle 2015-01-08 10:08:11 -05:00
commit 125c3b9105
2 changed files with 2 additions and 1 deletions

View File

@ -19,6 +19,7 @@ phpMyAdmin - ChangeLog
- bug #4694 js error on marking table as favorite in Safari (in private mode)
- bug #4695 Changing $cfg['DefaultTabTable'] doesn't update link and title
- bug Undefined index menuswork
- bug Undefined index navwork
4.3.6.0 (2015-01-07)
- bug Undefined index notices while configuring recent and favorite tables

View File

@ -624,7 +624,7 @@ class Node_Database extends Node
{
$ret = '';
$cfgRelation = PMA_getRelationsParam();
if ($cfgRelation['navwork']) {
if (isset($cfgRelation['navwork']) && $cfgRelation['navwork']) {
if ( $this->_hiddenCount > 0) {
$ret = '<span class="dbItemControls">'
. '<a href="navigation.php'