]> git.joonet.de Git - adminer.git/commitdiff
Use atomic group for CSV regexp
authorjakubvrana <jakubvrana@7c3ca157-0c34-0410-bff1-cbf682f78f5c>
Wed, 24 Feb 2010 13:12:58 +0000 (13:12 +0000)
committerjakubvrana <jakubvrana@7c3ca157-0c34-0410-bff1-cbf682f78f5c>
Wed, 24 Feb 2010 13:12:58 +0000 (13:12 +0000)
git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1329 7c3ca157-0c34-0410-bff1-cbf682f78f5c

adminer/select.inc.php

index a5998ebc7541d414467c789842cfac053f086f44..920b1fc2cda8ca1c1e4cc2f0430ec2007dfc3922 100644 (file)
@@ -98,7 +98,7 @@ if ($_POST && !$error) {
                        $file = preg_replace("~^\xEF\xBB\xBF~", '', $file); //! character set
                        $result = true;
                        $cols = array_keys($fields);
-                       preg_match_all('~("[^"]*"|[^"\\r\\n])+~', $file, $matches);
+                       preg_match_all('~(?>"[^"]*"|[^"\\r\\n]+)+~', $file, $matches);
                        $affected = count($matches[0]);
                        queries("START TRANSACTION");
                        foreach ($matches[0] as $key => $val) {