From 06a916102d60fe206996b88e4c62329ff5c47162 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Sun, 28 Nov 2010 17:58:35 +0100 Subject: [PATCH] Disable AJAX for schema change --- adminer/include/design.inc.php | 2 +- adminer/static/functions.js | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/adminer/include/design.inc.php b/adminer/include/design.inc.php index 6e9bb840..e0580091 100644 --- a/adminer/include/design.inc.php +++ b/adminer/include/design.inc.php @@ -32,7 +32,7 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") { - onclick="return bodyClick(event, '');" onload="bodyLoad('server_info, 0, 3) : ""); ?>', '');"> + onclick="return bodyClick(event, '', '');" onload="bodyLoad('server_info, 0, 3) : ""); ?>', '');"> diff --git a/adminer/static/functions.js b/adminer/static/functions.js index 45dadc33..7f9f3b3c 100644 --- a/adminer/static/functions.js +++ b/adminer/static/functions.js @@ -372,9 +372,10 @@ function selectDblClick(td, event, text) { /** Load link by AJAX * @param MouseEvent * @param string +* @param string * @return bool */ -function bodyClick(event, db) { +function bodyClick(event, db, ns) { if (event.getPreventDefault ? event.getPreventDefault() : !event.returnValue) { return false; } @@ -384,7 +385,8 @@ function bodyClick(event, db) { } if (/^a$/i.test(el.tagName) && !/^https?:|#/i.test(el.getAttribute('href')) && /[&?]username=/.exec(el.href)) { var match = /&db=([^&]*)/.exec(el.href); - return !(db == (match ? match[1] : '') && ajaxMain(el.href, '', event)); + var match2 = /&ns=([^&]*)/.exec(el.href); + return !(db == (match ? match[1] : '') && scheme == (match2 ? match2[1] : '') && ajaxMain(el.href, '', event)); } if (/^input$/i.test(el.tagName) && /submit|image/.test(el.type) && el.name != 'logout' && !/&(database|scheme|create|view|sql|user)=/.test(location.href)) { return !ajaxForm(el.form, (el.name ? encodeURIComponent(el.name) + '=1' : ''));