MDL-8860 - Enabled multilang filter for site title.

diff --git a/index.php b/index.php
index cd1b5d84b9fc7bdc95713dc05230d8b439330732..1053234f3f187020077b814d0577fccbe0358785 100644 (file)
--- a/index.php
+++ b/index.php
@@ -102,7 +102,7 @@
     $preferred_width_right = bounded_number(BLOCK_R_MIN_WIDTH, blocks_preferred_width($pageblocks[BLOCK_POS_RIGHT]), 
                                             BLOCK_R_MAX_WIDTH);
 
-    print_header(strip_tags($SITE->fullname), $SITE->fullname, 'home', '',
+    print_header($SITE->fullname, $SITE->fullname, 'home', '',
                  '<meta name="description" content="'. s(strip_tags($SITE->summary)) .'" />',
                  true, '', user_login_string($SITE).$langmenu);
 

diff --git a/lib/rsslib.php b/lib/rsslib.php
index 37406ef65b2436a0299f15863466485ab7fd7a6a..58e982347e7f7a435b15274a63a9dea5863cec76 100644 (file)
--- a/lib/rsslib.php
+++ b/lib/rsslib.php
@@ -145,7 +145,7 @@ function rss_standard_header($title = NULL, $link = NULL, $description = NULL) {
 
         //Calculate title, link and description
         if (empty($title)) {
-            $title = $site->fullname;
+            $title = format_string($site->fullname);
         }
         if (empty($link)) {
             $link = $CFG->wwwroot;
@@ -170,7 +170,7 @@ function rss_standard_header($title = NULL, $link = NULL, $description = NULL) {
             $result .= rss_full_tag('language', 2, false, substr($USER->lang,0,2));
         }
         $today = getdate();
-        $result .= rss_full_tag('copyright', 2, false, '© '. $today['year'] .' '. $site->fullname);
+        $result .= rss_full_tag('copyright', 2, false, '© '. $today['year'] .' '. format_string($site->fullname));
         /*
        if (!empty($USER->email)) {
             $result .= rss_full_tag('managingEditor', 2, false, fullname($USER));

diff --git a/lib/uploadlib.php b/lib/uploadlib.php
index 06d7691bda90a09e96ee8f142dc522276cfbdc82..a67b372c13eacbcfe82cafb0cca81e37ce4c3541 100644 (file)
--- a/lib/uploadlib.php
+++ b/lib/uploadlib.php
@@ -674,7 +674,7 @@ function clam_mail_admins($notice) {
     
     $site = get_site();
         
-    $subject = get_string('clamemailsubject', 'moodle', $site->fullname);
+    $subject = get_string('clamemailsubject', 'moodle', format_string($site->fullname));
     $admins = get_admins();
     foreach ($admins as $admin) {
         email_to_user($admin, get_admin(), $subject, $notice);

diff --git a/lib/weblib.php b/lib/weblib.php
index cef75867dc3e4d786674bd2d143510b0c259df35..cd800d3bc9374693026f11db42bd1dacd4d0ed29 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -1381,7 +1381,7 @@ function format_string ($string, $striplinks=true, $courseid=NULL ) {
     if ($strcache === false or count($strcache) > 2000 ) { // this number might need some tuning to limit memory usage in cron
         $strcache = array();
     }
-
+    
     //init course id
     if (empty($courseid)) {
         $courseid = $COURSE->id;
@@ -1397,11 +1397,11 @@ function format_string ($string, $striplinks=true, $courseid=NULL ) {
 
     // First replace all ampersands not followed by html entity code
     $string = preg_replace("/\&(?![a-z0-9#]{1,8};)/", "&", $string);
-    
+
     if (!empty($CFG->filterall)) {
         $string = filter_string($string, $courseid);
     }
-
+    
     // If the site requires it, strip ALL tags from this string
     if (!empty($CFG->formatstringstriptags)) {
         $string = strip_tags($string);
@@ -2233,7 +2233,7 @@ function print_header ($title='', $heading='', $navigation='', $focus='',
 
     // Clean up the title
 
-    $title = strip_tags(format_string($title));    // fix for MDL-8582
+    $title = format_string($title);    // fix for MDL-8582
     $title = str_replace('"', '"', $title);
 
     // Create class and id for this page

diff --git a/mod/resource/type/file/resource.class.php b/mod/resource/type/file/resource.class.php
index 7d31f6399c9336b6f125aff6ad5f57f47ba738b5..4dc4049b67509cf20507eec58bb5b8a33566a69b 100644 (file)
--- a/mod/resource/type/file/resource.class.php
+++ b/mod/resource/type/file/resource.class.php
@@ -65,7 +65,7 @@ function set_parameters() {
             'lang'            => array('langstr' => get_string('preferredlanguage'),
                                        'value'   => current_language()),
             'sitename'        => array('langstr' => get_string('fullsitename'),
-                                       'value'   => $site->fullname),
+                                       'value'   => format_string($site->fullname)),
             'serverurl'       => array('langstr' => get_string('serverurl', 'resource', $CFG),
                                        'value'   => $CFG->wwwroot),
             'currenttime'     => array('langstr' => get_string('time'),