MDL-15823 format_string() improvements; merged from MOODLE_19_STABLE

rwijaya · Jul 25, 2008 · 3e4fae4 · 3e4fae4
1 parent 84ca389
commit 3e4fae4
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/lib/weblib.php b/lib/weblib.php
@@ -1466,8 +1466,16 @@ function format_string ($string, $striplinks = false, $courseid=NULL ) {
         $string = filter_text($string, $courseid);
     }
 
-    if ($striplinks) {  //strip links in string
-        $string = preg_replace('/(<a[^>]+?>)(.+?)(<\/a>)/is','$2',$string);
+    // If the site requires it, strip ALL tags from this string
+    if (!empty($CFG->formatstringstriptags)) {
+        $string = strip_tags($string);
+
+    } else {
+        // Otherwise strip just links if that is required (default)
+        if ($striplinks) {  //strip links in string
+            $string = preg_replace('/(<a\s[^>]+?>)(.+?)(<\/a>)/is','$2',$string);
+        }
+        $string = clean_text($string);
     }
 
     //Store to cache