CRM-10431 - regression due to coder modifitcations

----------------------------------------
* CRM-10431: some regular expression strings were broken by coder module formatting
  http://issues.civicrm.org/jira/browse/CRM-10431

diff --git a/CRM/Activity/Import/Parser.php b/CRM/Activity/Import/Parser.php
index 6b5d261510b21ee9b60760e48bccc80e3a4e8bb9..4b9e93a7e104b5b8b2f379ab72e4b100fcb6deac 100644 (file)
--- a/CRM/Activity/Import/Parser.php
+++ b/CRM/Activity/Import/Parser.php
@@ -426,14 +426,14 @@ abstract class CRM_Activity_Import_Parser {
     }
   }
 
-  /*function setActiveFieldLocationTypes( $elements ) 
+  /*function setActiveFieldLocationTypes( $elements )
     {
         for ($i = 0; $i < count( $elements ); $i++) {
             $this->_activeFields[$i]->_hasLocationType = $elements[$i];
         }
     }
-    
-    function setActiveFieldPhoneTypes( $elements ) 
+
+    function setActiveFieldPhoneTypes( $elements )
     {
         for ($i = 0; $i < count( $elements ); $i++) {
             $this->_activeFields[$i]->_phoneType = $elements[$i];
@@ -634,7 +634,7 @@ abstract class CRM_Activity_Import_Parser {
     }
 
     foreach ($values as $k => $v) {
-      $values[$k] = preg_replace("/^$enclosure(.*) $enclosure$/", '$1', $v);
+      $values[$k] = preg_replace("/^$enclosure(.*)$enclosure$/", '$1', $v);
     }
   }
 

diff --git a/CRM/Contribute/Import/Parser.php b/CRM/Contribute/Import/Parser.php
index 3aa3c4ea254fd1adfd8e2f948badbc30b4e118a7..60082afef7ff19c69aba30a873e7e95de0ef5c56 100644 (file)
--- a/CRM/Contribute/Import/Parser.php
+++ b/CRM/Contribute/Import/Parser.php
@@ -809,7 +809,7 @@ pppp   * @return void
     }
 
     foreach ($values as $k => $v) {
-      $values[$k] = preg_replace("/^$enclosure(.*) $enclosure$/", '$1', $v);
+      $values[$k] = preg_replace("/^$enclosure(.*)$enclosure$/", '$1', $v);
     }
   }
 

diff --git a/CRM/Member/Import/Parser.php b/CRM/Member/Import/Parser.php
index e22d19dcfa62b13548fec50103abad0214546083..7afe34c30cdbfc981a4f5adc6d488c7ad37d108a 100644 (file)
--- a/CRM/Member/Import/Parser.php
+++ b/CRM/Member/Import/Parser.php
@@ -447,7 +447,7 @@ abstract class CRM_Member_Import_Parser {
             $this->_activeFields[$i]->_hasLocationType = $elements[$i];
         }
     }
-    
+
     function setActiveFieldPhoneTypes( $elements ) {
         for ($i = 0; $i < count( $elements ); $i++) {
             $this->_activeFields[$i]->_phoneType = $elements[$i];
@@ -675,7 +675,7 @@ abstract class CRM_Member_Import_Parser {
     }
 
     foreach ($values as $k => $v) {
-      $values[$k] = preg_replace("/^$enclosure(.*) $enclosure$/", '$1', $v);
+      $values[$k] = preg_replace("/^$enclosure(.*)$enclosure$/", '$1', $v);
     }
   }