MDL-8582 - reverted changes in print_navigation(), needs some minor rewrite to use...

diff --git a/lib/weblib.php b/lib/weblib.php
index 0a9a8ab74423feafdef27db5d5ad0d6c00b5d1ce..3f0f7c79aa130e0eb5c465dcfc7a09eca4959986 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -2820,9 +2820,9 @@ function print_navigation ($navigation, $separator=0, $return=false) {
             $site->shortname = get_string('home');
         }
 
-        $navigation = "<li>$separator ". str_replace('->', "</li>\n<li>$separator", s($navigation, false, false)) ."</li>\n";
+        $navigation = "<li>$separator ". str_replace('->', "</li>\n<li>$separator", $navigation) ."</li>\n";
         $output .= '<li class="first"><a '.$CFG->frametarget.' onclick="this.target=\''.$CFG->framename.'\'" href="'. $CFG->wwwroot.((!has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID)) && !empty($USER->id) && !empty($CFG->mymoodleredirect) && !isguest())
-                                                                       ? '/my' : '') .'/">'. s($site->shortname) ."</a></li>\n". $navigation;
+                                                                       ? '/my' : '') .'/">'. $site->shortname ."</a></li>\n". $navigation;
         $output .= "</ul>\n";
     }