Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java =================================================================== diff -u -r6a37d0aeb848e1c3e2fd5039e8d3f40df91c064a -r1c302b4cc728a5f47d0b710e5645212b782aedd4 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java (.../SurveyServiceImpl.java) (revision 6a37d0aeb848e1c3e2fd5039e8d3f40df91c064a) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java (.../SurveyServiceImpl.java) (revision 1c302b4cc728a5f47d0b710e5645212b782aedd4) @@ -91,6 +91,7 @@ import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.MessageService; +import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.util.audit.IAuditService; import org.lamsfoundation.lams.util.wddx.WDDXProcessor; import org.lamsfoundation.lams.util.wddx.WDDXProcessorConversionException; @@ -854,7 +855,7 @@ toolContentObj.setContentInUse(Boolean.FALSE); toolContentObj.setCreated(now); toolContentObj.setDefineLater(Boolean.FALSE); - toolContentObj.setInstructions((String)importValues.get(ToolContentImport102Manager.CONTENT_BODY)); + toolContentObj.setInstructions(WebUtil.convertNewlines((String)importValues.get(ToolContentImport102Manager.CONTENT_BODY))); toolContentObj.setOfflineInstructions(null); toolContentObj.setOnlineInstructions(null); toolContentObj.setRunOffline(Boolean.FALSE); @@ -902,7 +903,7 @@ Integer order = WDDXProcessor.convertToInteger(questionMap, ToolContentImport102Manager.CONTENT_SURVEY_ORDER); item.setSequenceId(order!=null?order.intValue():dummySequenceNumber++); - item.setDescription((String)questionMap.get(ToolContentImport102Manager.CONTENT_SURVEY_QUESTION)); + item.setDescription(WebUtil.convertNewlines((String)questionMap.get(ToolContentImport102Manager.CONTENT_SURVEY_QUESTION))); // completion message purposely not supported in 2.0, so value can be dropped.