Fixed $title in print_header (merged from stable) (no bug)

diff --git a/lib/weblib.php b/lib/weblib.php
index 379a6931b8fffcf2cb8dfb36fb4b863b68c22c4d..8af5024f3d6205d6c4576dd8ff14d94a0a9912bc 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -2199,8 +2199,8 @@ function print_header ($title='', $heading='', $navigation='', $focus='',
 
     // Clean up the title
 
+    $title = strip_tags(format_string($title));    // fix for MDL-8582
     $title = str_replace('"', '"', $title);
-    $title = strip_tags($title);
 
     // Create class and id for this page
 
@@ -2228,8 +2228,6 @@ function print_header ($title='', $heading='', $navigation='', $focus='',
     $bodytags .= ' class="'.$pageclass.'" id="'.$pageid.'"';
 
     ob_start();
-
-    $title = format_string($title); // fix for MDL-8582
     include($CFG->header);
     $output = ob_get_contents();
     ob_end_clean();