Merge remote-tracking branch 'origin/master'

2015-02-07 14:19:24 +01:00 · 2015-02-07 14:19:24 +01:00 · 63ceffbedb
commit 63ceffbedb
parent 339f477a51 b6350a8cd7
2 changed files with 2 additions and 1 deletions
--- a/1
+++ b/1
@ -38,6 +38,7 @@ phpMyAdmin - ChangeLog
 - bug       Cannot execute command from console (multi-server installation)

 4.3.10.0 (not yet released)
+- bug       Undefined index navwork

 4.3.9.0 (2015-02-05)
 - bug #4728 Incorrect headings in routine editor
--- a/navigation.php
+++ b/navigation.php
@ -24,7 +24,7 @@ if (! $response->isAjax()) {
 }

 $cfgRelation = PMA_getRelationsParam();
-if ($cfgRelation['navwork']) {
+if (isset($cfgRelation['navwork']) && $cfgRelation['navwork']) {
    if (isset($_REQUEST['hideNavItem'])) {
        if (! empty($_REQUEST['itemName'])
            && ! empty($_REQUEST['itemType'])