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

bug 3055906 error when running SQL query over AJAX

Browse Source
This commit is contained in:
Marc Delisle
2010-10-05 08:04:59 -04:00
parent bbe9bb7a76
commit 111faf4009
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/display_tbl.lib.php
View File

@@ -2085,8 +2085,11 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
echo '<input type="hidden" name="sql_query"' echo '<input type="hidden" name="sql_query"'
.' value="' . htmlspecialchars($sql_query) . '" />' . "\n"; .' 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"' echo '<input type="hidden" name="clause_is_unique"'
.' value="' . $clause_is_unique . '" />' . "\n"; .' value="' . $clause_is_unique . '" />' . "\n";

4
libraries/mult_submits.inc.php
View File

@@ -245,7 +245,9 @@ if (!empty($submit_mult) && !empty($what)) {
} }
if ($what == 'row_delete') { if ($what == 'row_delete') {
$_url_params['original_sql_query'] = $original_sql_query; $_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"> <form action="<?php echo $action; ?>" method="post">

4
tbl_row_action.php
View File

@@ -113,7 +113,9 @@ if (!empty($submit_mult)) {
$err_url = 'tbl_row_action.php' . PMA_generate_common_url($GLOBALS['url_params']); $err_url = 'tbl_row_action.php' . PMA_generate_common_url($GLOBALS['url_params']);
if (! isset($_REQUEST['mult_btn'])) { if (! isset($_REQUEST['mult_btn'])) {
$original_sql_query = $sql_query; $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'; require './libraries/mult_submits.inc.php';
$_url_params = $GLOBALS['url_params']; $_url_params = $GLOBALS['url_params'];