5 Oct
2010
5 Oct
'10
3:05 p.m.
The branch, master has been updated
via 3620dca510de97776f0975020ffe102f16b406d9 (commit)
via 111faf4009ec357bb1342738688b1b0921971190 (commit)
from b9fe8fc6f8fa583ce6b88d8e059b0912c1f7b676 (commit)
- Log -----------------------------------------------------------------
commit 3620dca510de97776f0975020ffe102f16b406d9
Merge: 111faf4009ec357bb1342738688b1b0921971190 b9fe8fc6f8fa583ce6b88d8e059b0912c1f7b676
Author: Marc Delisle <marc(a)infomarc.info>
Date: Tue Oct 5 08:05:37 2010 -0400
Merge branch 'master' of
ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
commit 111faf4009ec357bb1342738688b1b0921971190
Author: Marc Delisle <marc(a)infomarc.info>
Date: Tue Oct 5 08:04:59 2010 -0400
bug 3055906 error when running SQL query over AJAX
-----------------------------------------------------------------------
Summary of changes:
libraries/display_tbl.lib.php | 7 +++++--
libraries/mult_submits.inc.php | 4 +++-
tbl_row_action.php | 4 +++-
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index da88087..b68e78b 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -2085,8 +2085,11 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode,
$analyzed_sql)
echo '<input type="hidden" name="sql_query"'
.' value="' . htmlspecialchars($sql_query) . '"
/>' . "\n";
- echo '<input type="hidden" name="url_query"'
- .' value="' . $GLOBALS['url_query'] . '"
/>' . "\n";
+
+ if (! empty($GLOBALS['url_query'])) {
+ echo '<input type="hidden" name="url_query"'
+ .' value="' . $GLOBALS['url_query'] . '"
/>' . "\n";
+ }
echo '<input type="hidden"
name="clause_is_unique"'
.' value="' . $clause_is_unique . '" />' .
"\n";
diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php
index fe614e7..e473192 100644
--- a/libraries/mult_submits.inc.php
+++ b/libraries/mult_submits.inc.php
@@ -245,7 +245,9 @@ if (!empty($submit_mult) && !empty($what)) {
}
if ($what == 'row_delete') {
$_url_params['original_sql_query'] = $original_sql_query;
- $_url_params['original_url_query'] = $original_url_query;
+ if (! empty($original_url_query)) {
+ $_url_params['original_url_query'] = $original_url_query;
+ }
}
?>
<form action="<?php echo $action; ?>" method="post">
diff --git a/tbl_row_action.php b/tbl_row_action.php
index 8a9db7a..d44e808 100644
--- a/tbl_row_action.php
+++ b/tbl_row_action.php
@@ -113,7 +113,9 @@ if (!empty($submit_mult)) {
$err_url = 'tbl_row_action.php' .
PMA_generate_common_url($GLOBALS['url_params']);
if (! isset($_REQUEST['mult_btn'])) {
$original_sql_query = $sql_query;
- $original_url_query = $url_query;
+ if (! empty($url_query)) {
+ $original_url_query = $url_query;
+ }
}
require './libraries/mult_submits.inc.php';
$_url_params = $GLOBALS['url_params'];
hooks/post-receive
--
phpMyAdmin