Merged fix from http://moodle.org/mod/forum/discuss.php?d=38860 (Brian Jones)

diff --git a/files/index.php b/files/index.php
index dc570cc0d365c60e2b0e0f328cd6366e30936194..0c5e131a33efb553b80e80140b79c926b1dda3ab 100644 (file)
--- a/files/index.php
+++ b/files/index.php
@@ -383,6 +383,7 @@
             html_header($course, $wdir);
             if (($text != '') and confirm_sesskey()) {
                 $fileptr = fopen($basedir.'/'.$file,"w");
+                $text = preg_replace('/\x0D/', '', $text);  // http://moodle.org/mod/forum/discuss.php?d=38860
                 fputs($fileptr, stripslashes($text));
                 fclose($fileptr);
                 displaydir($wdir);