From: gustav_delius <gustav_delius>
Date: Tue, 22 Jun 2004 07:38:05 +0000 (+0000)
Subject: don't replace smilies in plain text format
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=7636b1194d6506c9856987d8ed4b1c4eaff63f95;p=moodle.git

don't replace smilies in plain text format
---

diff --git a/lang/en/help/textformat.html b/lang/en/help/textformat.html
index e51e1bc888..463eb6ae14 100644
--- a/lang/en/help/textformat.html
+++ b/lang/en/help/textformat.html
@@ -48,7 +48,7 @@
 <P>This format is useful when you need to include lots of code 
    or HTML that you want to be displayed exactly as you wrote it.
 
-<P>It still translates smilies and new lines, but otherwise your 
+<P>It still translates spaces and new lines, but otherwise your 
    text isn't touched.
 </UL>
 
diff --git a/lib/weblib.php b/lib/weblib.php
index 51aeb34c6d..b77fc60326 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -596,7 +596,6 @@ function format_text($text, $format=FORMAT_MOODLE, $options=NULL, $courseid=NULL
             $text = htmlentities($text);
             $text = rebuildnolinktag($text);
             $text = str_replace("  ", "&nbsp; ", $text);
-            replace_smilies($text);
             $text = nl2br($text);
             break;