Skip to content

Commit

Permalink
Fixed issue #5001: INSERTANS tags in question group name not converte…
Browse files Browse the repository at this point in the history
…d during import

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@9861 b72ed6b6-b9f8-46b5-92b4-906544132732
  • Loading branch information
Thibault Le Meur committed Mar 8, 2011
1 parent 468eb37 commit 900ac63
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions common_functions.php
Expand Up @@ -6794,11 +6794,12 @@ function TranslateInsertansTags($newsid,$oldsid,$fieldnames)
} // end while qentry

# translate 'description' INSERTANS tags in groups
$sql = "SELECT gid, language, description from {$dbprefix}groups WHERE sid=".$newsid." AND description LIKE '%{INSERTANS:".$oldsid."X%' ";
$sql = "SELECT gid, language, group_name, description from {$dbprefix}groups WHERE sid=".$newsid." AND description LIKE '%{INSERTANS:".$oldsid."X%' OR group_name LIKE '%{INSERTANS:".$oldsid."X%'";
$res = db_execute_assoc($sql) or safe_die("Can't read groups table in transInsertAns ".$connect->ErrorMsg()); // Checked

while ($qentry = $res->FetchRow())
{
$gpname = $qentry['group_name'];
$description = $qentry['description'];
$gid = $qentry['gid'];
$language = $qentry['language'];
Expand All @@ -6807,13 +6808,15 @@ function TranslateInsertansTags($newsid,$oldsid,$fieldnames)
{
$pattern = "{INSERTANS:".$sOldFieldname."}";
$replacement = "{INSERTANS:".$sNewFieldname."}";
$gpname = preg_replace('/'.$pattern.'/', $replacement, $gpname);
$description=preg_replace('/'.$pattern.'/', $replacement, $description);
}

if (strcmp($description,$qentry['description']) !=0 )
if (strcmp($description,$qentry['description']) !=0 ||
strcmp($gpname,$qentry['group_name']) !=0)
{
// Update Field
$sqlupdate = "UPDATE {$dbprefix}groups SET description='".db_quote($description)."' WHERE gid=$gid AND language='$language'";
// Update Fields
$sqlupdate = "UPDATE {$dbprefix}groups SET description='".db_quote($description)."', group_name='".db_quote($gpname)."' WHERE gid=$gid AND language='$language'";
$updateres=$connect->Execute($sqlupdate) or safe_die ("Couldn't update INSERTANS in groups<br />$sqlupdate<br />".$connect->ErrorMsg()); //Checked
} // Enf if modified
} // end while qentry
Expand Down

0 comments on commit 900ac63

Please sign in to comment.