From 769df9acec78016a4f85304d9af084a6d1ff0e56 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 8 Jan 2015 09:33:02 -0500 Subject: [PATCH] Bug Undefined index menuswork Signed-off-by: Marc Delisle --- ChangeLog | 1 + server_privileges.php | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 749ba9c526..9df71c196d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog 4.3.7.0 (not yet released) - 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 4.3.6.0 (2015-01-07) - bug Undefined index notices while configuring recent and favorite tables diff --git a/server_privileges.php b/server_privileges.php index e9dc898bef..2db8f91ce7 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -27,7 +27,9 @@ $header = $response->getHeader(); $scripts = $header->getScripts(); $scripts->addFile('server_privileges.js'); -if ((isset($_REQUEST['viewing_mode']) && $_REQUEST['viewing_mode'] == 'server') +if ((isset($_REQUEST['viewing_mode']) + && $_REQUEST['viewing_mode'] == 'server') + && isset($GLOBALS['cfgRelation']['menuswork']) && $GLOBALS['cfgRelation']['menuswork'] ) { include_once 'libraries/server_users.lib.php';