From: moodler <moodler>
Date: Fri, 16 Mar 2007 02:52:30 +0000 (+0000)
Subject: Merged format_string fix from stable  MDL-8713
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=037da74d09086a2ec4c00d6a0bea381f33b98117;p=moodle.git

Merged format_string fix from stable  MDL-8713
---

diff --git a/lib/weblib.php b/lib/weblib.php
index df920de9ed..166fbe95b5 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -1435,7 +1435,7 @@ function format_string ($string, $striplinks = false, $courseid=NULL ) {
     $string = preg_replace("/\&(?![a-z0-9#]{1,8};)/", "&amp;", $string);
     
     if (!empty($CFG->filterall)) {
-        $string = filter_text($string, $courseid);
+        $string = filter_string($string, $courseid);
     }
 
     if ($striplinks) {  //strip links in string
@@ -1445,10 +1445,6 @@ function format_string ($string, $striplinks = false, $courseid=NULL ) {
     //Store to cache
     $strcache[$md5] = $string;
     
-    if (!empty($CFG->filterall)) {
-        $string = filter_string($string, $courseid);
-    }
-        
     return $string;
 }