Index: lib.php
===================================================================
--- lib.php	(.../trunk/moodle/mod/assignment/lib.php)	(revision 11)
+++ lib.php	(.../tags/20080128customized/mod/assignment/lib.php)	(revision 16)
@@ -660,6 +660,11 @@
         $output .= '<script type="text/javascript">'."\n<!--\n";
         if (empty($SESSION->flextable['mod-assignment-submissions']->collapse['submissioncomment'])) {
             if ($quickgrade){
+            	error_log("Looking for embedded newlines in " .trim($submission->submissioncomment));
+            	$submission->submissioncomment=preg_replace('/[\n\r]+/', ' ', $submission->submissioncomment, -1, $replaceCount);
+            	if($replaceCount>0) {
+            		error_log("Made $replaceCount replacement(s): ".trim($submission->submissioncomment));
+            	}
                 $output.= 'opener.document.getElementById("submissioncomment'.$submission->userid.'").value="'
                 .trim($submission->submissioncomment).'";'."\n";
              } else {