Merge branch 'QA_4_6'

phpmyadmin · Oct 5, 2016 · ff91dc9 · ff91dc9
2 parents 48d599e + 0de5f60
commit ff91dc9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -88,6 +88,7 @@ phpMyAdmin - ChangeLog
 - issue #12615 Fixed regexp for matching browser versions
 - issue #12569 Avoid showing import errors twice
 - issue #12362 prefs_manage.php can leave an orphaned temporary file
+- issue #12619 Unable to export csv when using union select
 
 4.6.4 (2016-08-16)
 - issue        [security] Weaknesses with cookie encryption, see PMASA-2016-29

diff --git a/tbl_export.php b/tbl_export.php
@@ -67,7 +67,9 @@
         }
 
         // Rebuilding the SELECT and FROM clauses.
-        if (count($parser->statements[0]->from) > 0) {
+        if (count($parser->statements[0]->from) > 0
+            && count($parser->statements[0]->union) === 0
+        ) {
             $replaces = array(
                 array(
                     'FROM', 'FROM ' . SqlParser\Components\ExpressionArray::build(