Don't export binary and geometry columns twice in select

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index dfb24f99bec114a3262b5e185deab54242a42382..7856033077298298a8053da48a3eb6ca462c73b8 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -31,7 +31,7 @@ $where = $adminer->selectSearchProcess($fields, $indexes);
 $order = $adminer->selectOrderProcess($fields, $indexes);
 $limit = $adminer->selectLimitProcess();
 $from = ($select ? implode(", ", $select) : "*" . ($oid ? ", $oid" : ""));
-if ($jush == "sql") {
+if ($jush == "sql" && !$_POST["export"]) {
        foreach ($columns as $key => $val) {
                if ($select && !$select[$key]) {
                        continue;

diff --git a/changes.txt b/changes.txt
index b42625ddeb8b93849d70d64bd4cb293be8a0d1a4..641a627ee89b741fb0eb397b9f47e4bc910f2168 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -1,6 +1,7 @@
 Adminer 3.6.5-dev:
 Print run time next to executed queries
 Fix handling of POINT data type (bug #3582578)
+Don't export binary and geometry columns twice in select
 
 Adminer 3.6.4 (released 2013-04-26):
 Display pagination on a fixed position