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

Bug 831181

Browse Source
This commit is contained in:
Garvin Hicking
2003-11-05 15:40:55 +00:00
parent 6f3399ac5a
commit 10dc5d05d3
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -6,6 +6,9 @@ $Id$
$Source$ $Source$
2003-11-05 Garvin Hicking <me@supergarv.de> 2003-11-05 Garvin Hicking <me@supergarv.de>
* libraries/common.lib.php3, footer.inc.php3: Bug #831181: Do not
store queries with errors in history, also when coming from the
database SQL tab.
* libraries/common.lib.php3: Bug #835854. The MySQL-error messages * libraries/common.lib.php3: Bug #835854. The MySQL-error messages
are now put inside a <code> HTML-container, not <pre>. This allows are now put inside a <code> HTML-container, not <pre>. This allows
wordwrapping to hide vertical scrollbars. Linebreak/Whitespace wordwrapping to hide vertical scrollbars. Linebreak/Whitespace

4
footer.inc.php3
View File

@@ -26,7 +26,7 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
?> ?>
<?php <?php
if (!isset($error_message) || $error_message == '') { if (!isset($no_history) && (!isset($error_message) || $error_message == '')) {
?> ?>
if (parent.frames.queryframe && parent.frames.queryframe.document && parent.frames.queryframe.document.queryframeform) { if (parent.frames.queryframe && parent.frames.queryframe.document && parent.frames.queryframe.document.queryframeform) {
parent.frames.queryframe.document.queryframeform.db.value = "<?php echo (isset($db) ? addslashes($db) : ''); ?>"; parent.frames.queryframe.document.queryframeform.db.value = "<?php echo (isset($db) ? addslashes($db) : ''); ?>";
@@ -41,7 +41,7 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
<?php echo ($cfg['QueryFrameDebug'] ? 'document.writeln("<a href=\'#\' onClick=\'parent.frames.queryframe.querywindow.focus(); return false;\'>Query Window</a> can be updated.<br>");' : ''); ?> <?php echo ($cfg['QueryFrameDebug'] ? 'document.writeln("<a href=\'#\' onClick=\'parent.frames.queryframe.querywindow.focus(); return false;\'>Query Window</a> can be updated.<br>");' : ''); ?>
<?php <?php
if (!isset($error_message) || $error_message == '') { if (!isset($no_history) && (!isset($error_message) || $error_message == '')) {
if (isset($LockFromUpdate) && $LockFromUpdate == '1' && isset($sql_query)) { if (isset($LockFromUpdate) && $LockFromUpdate == '1' && isset($sql_query)) {
// When the button 'LockFromUpdate' was selected in the querywindow, it does not submit it's contents to // When the button 'LockFromUpdate' was selected in the querywindow, it does not submit it's contents to
// itself. So we create a SQL-history entry here. // itself. So we create a SQL-history entry here.

2
libraries/common.lib.php3
View File

@@ -521,7 +521,7 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold}
echo PMA_showMySQLDocu('Error-returns', 'Error-returns'); echo PMA_showMySQLDocu('Error-returns', 'Error-returns');
if (!empty($back_url) && $exit) { if (!empty($back_url) && $exit) {
echo '&nbsp;&middot;&nbsp;[<a href="' . $back_url . '">' . $GLOBALS['strBack'] . '</a>]'; echo '&nbsp;&middot;&nbsp;[<a href="' . (strstr($back_url, '?') ? $back_url . '&amp;no_history=true' : $back_url . '?no_history=true') . '">' . $GLOBALS['strBack'] . '</a>]';
} }
echo "\n"; echo "\n";