From fbea8ea040c541969571f94ecd6e9ba1c1a9913c Mon Sep 17 00:00:00 2001 From: Alar of Runetotem Date: Tue, 13 Sep 2016 19:46:58 +0200 Subject: [PATCH] Reviewed against more test cases \R was causing some issues as negated class --- CRM/Utils/File.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CRM/Utils/File.php b/CRM/Utils/File.php index 64528a3855..eb61db9248 100644 --- a/CRM/Utils/File.php +++ b/CRM/Utils/File.php @@ -324,7 +324,7 @@ class CRM_Utils_File { // get rid of comments starting with # and -- - $string = preg_replace("/^(#|--)[^\R]*$/m", "", $string); + $string = preg_replace("/^(#|--).*\R*/m", "", $string); $queries = preg_split('/;\s*$/m', $string); foreach ($queries as $query) { -- 2.25.1