Merged format_string fix from stable MDL-8713

diff --git a/lib/weblib.php b/lib/weblib.php
index df920de9edfb42618ae077f0519eead644604893..166fbe95b5c28b7e4c11d21836923a1899403dfc 100644 (file)
--- 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};)/", "&", $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;
 }