From 6c497b590f8fb837bd7538f6b1c6ad7ece1b3fd7 Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Tue, 16 Aug 2016 13:48:09 +0530 Subject: [PATCH] Reload Navigation if no prev entry stored This automatically ensures check for url params. If token does not match, store the current NavTree status in sessionStorage Fix #12384 Signed-off-by: Deven Bansod --- js/navigation.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js/navigation.js b/js/navigation.js index c134f34702..ae8704b74b 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -552,12 +552,15 @@ $(function () { if ($('#pma_navigation_tree_content').length && typeof storage.navTreePaths === 'undefined' ) { - navTreeStateUpdate(); + PMA_reloadNavigation(); } else if (PMA_commonParams.get('server') === storage.server && PMA_commonParams.get('token') === storage.token ) { // Reload the tree to the state before page refresh PMA_reloadNavigation(null, JSON.parse(storage.navTreePaths)); + } else { + // If the user is different + navTreeStateUpdate(); } } });