From: moodler <moodler>
Date: Wed, 8 Sep 2004 16:18:45 +0000 (+0000)
Subject: Merged smiley/Markdown fixes
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=7c3aa358879af3f50899a4db3338056f8b91f645;p=moodle.git

Merged smiley/Markdown fixes
---

diff --git a/lib/weblib.php b/lib/weblib.php
index 3e171f0862..08558ef38f 100644
--- 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;