don't replace smilies in plain text format

diff --git a/lang/en/help/textformat.html b/lang/en/help/textformat.html
index e51e1bc8888a2f669d80d314ba3e25e5bd03f8ee..463eb6ae149bea67125f5f4e7ca6e14287619842 100644 (file)
--- 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 51aeb34c6dda89be9f85516e0a15c22276b668a1..b77fc6032639a2c394e04000f3be8625f64d7ef0 100644 (file)
--- 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("  ", "  ", $text);
-            replace_smilies($text);
             $text = nl2br($text);
             break;