From: moodler <moodler>
Date: Thu, 14 Sep 2006 05:46:49 +0000 (+0000)
Subject: Merged fix from http://moodle.org/mod/forum/discuss.php?d=38860 (Brian Jones)
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=c64633f6f6293aaa6dfc6acc1a09165bce76110a;p=moodle.git

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 dc570cc0d3..0c5e131a33 100644
--- 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);