MDL-15823 format_string() improvements; merged from MOODLE_19_STABLE

2008-07-25 22:45:04 +00:00
parent 8e3cb48829
commit 7387acb1e0
1 changed files with 6 additions and 3 deletions
@@ -1436,9 +1436,12 @@ function format_string ($string, $striplinks=true, $courseid=NULL ) {
    if (!empty($CFG->formatstringstriptags)) {
        $string = strip_tags($string);

-    // Otherwise strip just links if that is required (default)
-    } else if ($striplinks) {  //strip links in string
-        $string = preg_replace('/(<a[^>]+?>)(.+?)(<\/a>)/is','$2',$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