Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java,v
diff -u -r1.20 -r1.21
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	14 Dec 2010 23:14:59 -0000	1.20
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	9 Jun 2011 12:13:59 -0000	1.21
@@ -390,6 +390,7 @@
 	    if (question != null) {
 		// This flushs user UID info to message if this user is a new user.
 		question.setCreateBy(assessmentUser);
+		removeNewLineCharacters(question);
 		questionList.add(question);
 	    }
 	}
@@ -1473,4 +1474,28 @@
 	}
 	return paramMap;
     }
+
+    /**
+     * Removes redundant new line characters from options left by CKEditor (otherwise it will break Javascript in
+     * monitor)
+     * 
+     * @param question
+     */
+    private void removeNewLineCharacters(AssessmentQuestion question) {
+	Set<AssessmentQuestionOption> options = question.getQuestionOptions();
+	if (options != null) {
+	    for (AssessmentQuestionOption option : options) {
+		String optionString = option.getOptionString();
+		if (optionString != null) {
+		    option.setOptionString(optionString.replaceAll("[\n\r\f]", ""));
+		}
+
+		String questionStr = option.getQuestion();
+		if (questionStr != null) {
+		    option.setQuestion(questionStr.replaceAll("[\n\r\f]", ""));
+		}
+	    }
+	    
+	}
+    }
 }