Merged smiley/Markdown fixes

diff --git a/lib/weblib.php b/lib/weblib.php
index 3e171f08629b2eab91b288bb074492dbc6331860..08558ef38f7c175505e5c190454c1dd865ede191 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -639,6 +639,7 @@ function format_text($text, $format=FORMAT_MOODLE, $options=NULL, $courseid=NULL
             if (!isset($options->noclean)) {
                 $text = clean_text($text, $format);
             }
+            replace_smilies($text);
             $text = filter_text($text, $courseid);
             break;