Fix hitting backtrack limit in import (thanks to Tomas Votruba)

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 861a410191ef34a639da9319645a73240a7afcac..5ac41d39f9b29496fab5d25eb8bfe8de438b7179 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -171,7 +171,7 @@ if ($_POST && !$error) {
                        begin();
                        $separator = ($_POST["separator"] == "csv" ? "," : ($_POST["separator"] == "tsv" ? "\t" : ";"));
                        foreach ($matches[0] as $key => $val) {
-                               preg_match_all("~((\"[^\"]*\")+|[^$separator]*)$separator~", $val . $separator, $matches2);
+                               preg_match_all("~((?>\"[^\"]*\")+|[^$separator]*)$separator~", $val . $separator, $matches2);
                                if (!$key && !array_diff($matches2[1], $cols)) { //! doesn't work with column names containing ",\n
                                        // first row corresponds to column names - use it for table structure
                                        $cols = $matches2[1];

diff --git a/changes.txt b/changes.txt
index 300095a789b47b0501032a3fa4d93bbf76f7cfa5..53b1817807c4ce2b4a5ed5d8cf0393c96015e74b 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -1,6 +1,7 @@
 Adminer 3.6.2-dev:
 Edit values by Ctrl+click instead of double click
 Don't select row on double click
+Support NULL in routine calls
 Shorten printed values in varchar fields
 Display table default values on wide screens
 Display date in SQL history