diff --git a/admin/importsurvey.php b/admin/importsurvey.php
index b2f1be8b27d..162a97eac82 100644
--- a/admin/importsurvey.php
+++ b/admin/importsurvey.php
@@ -527,7 +527,7 @@ function array_combine($a, $b) {
$values=array_values($surveyrowdata);
$values=array_map(array(&$connect, "qstr"),$values); // quote everything accordingly
-$insert = "insert INTO {$dbprefix}surveys (".implode(',',array_keys($surveyrowdata)).") VALUES (".implode(',',$values).")"; //handle db prefix
+$insert = "INSERT INTO {$dbprefix}surveys (".implode(',',array_keys($surveyrowdata)).") VALUES (".implode(',',$values).")"; //handle db prefix
$iresult = $connect->Execute($insert) or die("
".$clang->gT("Import of this survey file failed")."
\n[$insert]
$surveyarray[0]
\n" . $connect->ErrorMsg());
$oldsid=$surveyid;
@@ -539,11 +539,15 @@ function array_combine($a, $b) {
unset($surveylsarray[0]);
foreach ($surveylsarray as $slsrow) {
$fieldcontents=convertCSVRowToArray($slsrow,',','"');
- $surveylsrowdata=array_combine($fieldorders,$fieldcontents);
+ $surveylsrowdata=array_combine($fieldorders,$fieldcontents);
+ // convert back the '\'.'n' cahr from the CSV file to true return char "\n"
+ $surveylsrowdata=array_map('convertCsvreturn2return', $surveylsrowdata);
+ // Convert the \n return char from welcometext to
+ $surveylsrowdata['surveyls_welcometext'] = str_replace("\n", "
", $surveylsrowdata['surveyls_welcometext']);
$surveylsrowdata['surveyls_survey_id']=$newsid;
$newvalues=array_values($surveylsrowdata);
$newvalues=array_map(array(&$connect, "qstr"),$newvalues); // quote everything accordingly
- $lsainsert = "insert INTO {$dbprefix}surveys_languagesettings (".implode(',',array_keys($surveylsrowdata)).") VALUES (".implode(',',$newvalues).")"; //handle db prefix
+ $lsainsert = "INSERT INTO {$dbprefix}surveys_languagesettings (".implode(',',array_keys($surveylsrowdata)).") VALUES (".implode(',',$newvalues).")"; //handle db prefix
$lsiresult=$connect->Execute($lsainsert) or die("
".$clang->gT("Import of this survey file failed")."
\n[$lsainsert]
\n" . $connect->ErrorMsg() );
}
@@ -1033,4 +1037,9 @@ function convertToArray($stringtoconvert, $seperator, $start, $end)
return $resultarray;
}
+function convertCsvreturn2return($string)
+{
+ return str_replace('\n', "\n", $string);
+}
+
?>