From 4858f332c88f00e6bf03ea2cf19e4e14c483a300 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Fri, 26 Apr 2013 11:57:21 -0700 Subject: [PATCH] Disable SQL export when applying functions in select --- adminer/select.inc.php | 6 ++++++ changes.txt | 1 + 2 files changed, 7 insertions(+) diff --git a/adminer/select.inc.php b/adminer/select.inc.php index 78560330..fbc0d19d 100644 --- a/adminer/select.inc.php +++ b/adminer/select.inc.php @@ -472,6 +472,12 @@ if (!$columns) { dumpFormat(); + foreach ((array) $_GET["columns"] as $column) { + if ($column["fun"]) { + unset($format['sql']); + break; + } + } if ($format) { print_fieldset("export", lang('Export')); $output = $adminer->dumpOutput(); diff --git a/changes.txt b/changes.txt index 641a627e..b7130137 100644 --- a/changes.txt +++ b/changes.txt @@ -1,5 +1,6 @@ Adminer 3.6.5-dev: Print run time next to executed queries +Disable SQL export when applying functions in select Fix handling of POINT data type (bug #3582578) Don't export binary and geometry columns twice in select