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

Merge branch 'QA_4_3'

Browse Source 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
This commit is contained in:
Madhura Jayaratne 2014-11-19 09:33:54 +05:30
commit 923f6682fb
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -76,6 +76,7 @@ phpMyAdmin - ChangeLog
- bug #4586 Javascript error after moving a column
- bug #4576 Issue with long comments on table columns
- bug #4599 Input field unnecessarily selected on focus
- bug #4602 Exporting selected rows exports all rows of the query
4.2.11.0 (2014-10-31)
- bug ReferenceError: Table_onover is not defined

8
libraries/display_export.lib.php
View File

@ -140,12 +140,12 @@ function PMA_getHtmlForHiddenInput(
$html .= '<input type="hidden" name="export_method" value="'
. htmlspecialchars($cfg['Export']['method']) . '" />';
if (isset($_GET['sql_query'])) {
$html .= '<input type="hidden" name="sql_query" value="'
. htmlspecialchars($_GET['sql_query']) . '" />' . "\n";
} elseif (! empty($sql_query)) {
if (! empty($sql_query)) {
$html .= '<input type="hidden" name="sql_query" value="'
. htmlspecialchars($sql_query) . '" />' . "\n";
} elseif (isset($_GET['sql_query'])) {
$html .= '<input type="hidden" name="sql_query" value="'
. htmlspecialchars($_GET['sql_query']) . '" />' . "\n";
}
return $html;