Fixed issue #05636: INSERTANS:SGQA codes not being converted upon import

Dev updated limesurvey2_sample to show that this works properly for all SGQA even those used in EM without INSERTANS: prefix Dev also updated the sample survey to confirm that all prefix/suffix and scale A/B and other label replacements work. git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@11725 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Dec 22, 2011 · d267bd3 · d267bd3
1 parent 4be8c86
commit d267bd3
Show file tree

Hide file tree

Showing 2 changed files with 24,065 additions and 5,745 deletions.
diff --git a/common_functions.php b/common_functions.php
@@ -5901,8 +5901,8 @@ function TranslateInsertansTags($newsid,$oldsid,$fieldnames)
 
         foreach ($fieldnames as $sOldFieldname=>$sNewFieldname)
         {
-            $pattern = "{INSERTANS:".$sOldFieldname."}";
-            $replacement = "{INSERTANS:".$sNewFieldname."}";
+            $pattern = $sOldFieldname;
+            $replacement = $sNewFieldname;
             $urldescription=preg_replace('/'.$pattern.'/', $replacement, $urldescription);
             $endurl=preg_replace('/'.$pattern.'/', $replacement, $endurl);
         }
@@ -5927,8 +5927,8 @@ function TranslateInsertansTags($newsid,$oldsid,$fieldnames)
 
         foreach ($fieldnames as $sOldFieldname=>$sNewFieldname)
         {
-            $pattern = "{INSERTANS:".$sOldFieldname."}";
-            $replacement = "{INSERTANS:".$sNewFieldname."}";
+            $pattern = $sOldFieldname;
+            $replacement = $sNewFieldname;
             $urldescription=preg_replace('/'.$pattern.'/', $replacement, $urldescription);
             $endurl=preg_replace('/'.$pattern.'/', $replacement, $endurl);
         }
@@ -5956,8 +5956,8 @@ function TranslateInsertansTags($newsid,$oldsid,$fieldnames)
 
         foreach ($fieldnames as $sOldFieldname=>$sNewFieldname)
         {
-            $pattern = "{INSERTANS:".$sOldFieldname."}";
-            $replacement = "{INSERTANS:".$sNewFieldname."}";
+            $pattern = $sOldFieldname;
+            $replacement = $sNewFieldname;
             $gpname = preg_replace('/'.$pattern.'/', $replacement, $gpname);
             $description=preg_replace('/'.$pattern.'/', $replacement, $description);
         }
@@ -5984,8 +5984,8 @@ function TranslateInsertansTags($newsid,$oldsid,$fieldnames)
 
         foreach ($fieldnames as $sOldFieldname=>$sNewFieldname)
         {
-            $pattern = "{INSERTANS:".$sOldFieldname."}";
-            $replacement = "{INSERTANS:".$sNewFieldname."}";
+            $pattern = $sOldFieldname;
+            $replacement = $sNewFieldname;
             $question=preg_replace('/'.$pattern.'/', $replacement, $question);
             $help=preg_replace('/'.$pattern.'/', $replacement, $help);
         }
@@ -6013,8 +6013,8 @@ function TranslateInsertansTags($newsid,$oldsid,$fieldnames)
 
         foreach ($fieldnames as $sOldFieldname=>$sNewFieldname)
         {
-            $pattern = "{INSERTANS:".$sOldFieldname."}";
-            $replacement = "{INSERTANS:".$sNewFieldname."}";
+            $pattern = $sOldFieldname;
+            $replacement = $sNewFieldname;
             $answer=preg_replace('/'.$pattern.'/', $replacement, $answer);
         }