MDL-12429 Applied and tested François' patches to 1.8, 1.9 and head.

diff --git a/lib/weblib.php b/lib/weblib.php
index 8681aca0268f251f4f2fe8e2feeacb732341f029..278d7d4634585edee8803c8602f854458bea98e0 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -6856,6 +6856,9 @@ function doc_link($path='', $text='', $iconpath='') {
     $lang = str_replace('_utf8', '', current_language());
     $url = $CFG->docroot. '/' .$lang. '/' .$path;
 
+    $lang = str_replace('_utf8', '', current_language());
+    $url = $CFG->docroot. '/' .$lang. '/' .$path;
+    
     $target = '';
     if (!empty($CFG->doctonewwindow)) {
         $target = " onclick=\"window.open('$url'); return false;\"";