nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Bug #735970 (query history only with correct queries)

Browse Source
This commit is contained in:
Garvin Hicking
2003-05-12 17:17:13 +00:00
parent 9dc279db5f
commit 8e23dab626
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -8,6 +8,8 @@ $Source$
2003-05-12 Garvin Hicking <me@supergarv.de> 2003-05-12 Garvin Hicking <me@supergarv.de>
* queryframe.php3: Remove left/bottom margin to better fit the link title * queryframe.php3: Remove left/bottom margin to better fit the link title
in the small frame. in the small frame.
* footer.inc.php3: Only update db/table variables if the query was correct.
Fixes #735970.
2003-05-12 Michal Cihar <nijel@users.sourceforge.net> 2003-05-12 Michal Cihar <nijel@users.sourceforge.net>
* index.php3: Better fix for #736003. * index.php3: Better fix for #736003.

12
footer.inc.php3
View File

@@ -32,6 +32,9 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
if (top.frames.queryframe && top.frames.queryframe.querywindow && !top.frames.queryframe.querywindow.closed && top.frames.queryframe.querywindow.location) { if (top.frames.queryframe && top.frames.queryframe.querywindow && !top.frames.queryframe.querywindow.closed && top.frames.queryframe.querywindow.location) {
<?php echo ($cfg['QueryFrameDebug'] ? 'document.writeln("<a href=\'#\' onClick=\'top.frames.queryframe.querywindow.focus(); return false;\'>Query Window</a> can be updated.<br>");' : ''); ?> <?php echo ($cfg['QueryFrameDebug'] ? 'document.writeln("<a href=\'#\' onClick=\'top.frames.queryframe.querywindow.focus(); return false;\'>Query Window</a> can be updated.<br>");' : ''); ?>
<?php
if (!isset($error_message) || $error_message == '') {
?>
top.frames.queryframe.querywindow.document.querywindow.db.value = "<?php echo (isset($db) ? addslashes($db) : '') ?>"; top.frames.queryframe.querywindow.document.querywindow.db.value = "<?php echo (isset($db) ? addslashes($db) : '') ?>";
top.frames.queryframe.querywindow.document.querywindow.query_history_latest_db.value = "<?php echo (isset($db) ? addslashes($db) : '') ?>"; top.frames.queryframe.querywindow.document.querywindow.query_history_latest_db.value = "<?php echo (isset($db) ? addslashes($db) : '') ?>";
top.frames.queryframe.querywindow.document.querywindow.table.value = "<?php echo (isset($table) ? addslashes($table) : '') ?>"; top.frames.queryframe.querywindow.document.querywindow.table.value = "<?php echo (isset($table) ? addslashes($table) : '') ?>";
@@ -40,7 +43,14 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
<?php echo (isset($sql_query) ? 'top.frames.queryframe.querywindow.document.querywindow.query_history_latest.value = "' . urlencode($sql_query) . '";' : '// no sql query update') . "\n"; ?> <?php echo (isset($sql_query) ? 'top.frames.queryframe.querywindow.document.querywindow.query_history_latest.value = "' . urlencode($sql_query) . '";' : '// no sql query update') . "\n"; ?>
<?php echo ($cfg['QueryFrameDebug'] ? 'alert(\'Querywindow submits. Last chance to check variables.\');' : '') . "\n"; ?> <?php echo ($cfg['QueryFrameDebug'] ? 'alert(\'Querywindow submits. Last chance to check variables.\');' : '') . "\n"; ?>
<?php echo ((!isset($error_message) || $error_message == '') ? 'top.frames.queryframe.querywindow.document.querywindow.submit();' : '// no submit, query was invalid') . "\n"; ?> top.frames.queryframe.querywindow.document.querywindow.submit();
<?php
} else {
?>
// no submit, query was invalid
<?php
}
?>
} }
} }