Skip to content
Browse files

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

  • Loading branch information...
1 parent 0ac5a66 commit ab20c18c2e468fb55d519e08247dccd7e9e407c5 @vrana committed
Showing with 2 additions and 1 deletion.
  1. +1 −1 adminer/select.inc.php
  2. +1 −0 changes.txt
View
2 adminer/select.inc.php
@@ -171,7 +171,7 @@
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];
View
1 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

0 comments on commit ab20c18

Please sign in to comment.
Something went wrong with that request. Please try again.