Merge remote-tracking branch 'origin/master'

phpmyadmin · Dec 28, 2013 · 5c09f55 · 5c09f55
2 parents 8688fa4 + f8e485f
commit 5c09f55
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/js/ajax.js b/js/ajax.js
@@ -544,7 +544,11 @@ AJAX.cache = {
      * @return void
      */
     navigate: function (index) {
-        if (typeof this.pages[index] === 'undefined') {
+        if (typeof this.pages[index] === 'undefined'
+            || typeof this.pages[index].content === 'undefined'
+            || typeof this.pages[index].menu === 'undefined'
+            || ! AJAX.cache.menus.get(this.pages[index].menu)
+        ) {
             PMA_ajaxShowMessage(
                 '<div class="error">' + PMA_messages.strInvalidPage + '</div>',
                 false
@@ -557,7 +561,7 @@ AJAX.cache = {
                 $('#selflink').html(record.selflink);
                 AJAX.cache.menus.replace(AJAX.cache.menus.get(record.menu));
                 PMA_commonParams.setAll(record.params);
-                AJAX.scriptHandler.load(record.scripts, record.params.token);
+                AJAX.scriptHandler.load(record.scripts, record.params ? record.params.token : PMA_commonParams.get('token'));
                 AJAX.cache.current = ++index;
             });
         }