]> git.mjollnir.org Git - moodle.git/commitdiff
projects / moodle.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 82355e2)
Followup fix for Bug MDL-8507 "Local language pack-name can appear in language code"
authornfreear <nfreear>
Wed, 21 Feb 2007 10:42:50 +0000 (10:42 +0000)
committernfreear <nfreear>
Wed, 21 Feb 2007 10:42:50 +0000 (10:42 +0000)
backup/restorelib.php patch | blob | history
lib/weblib.php patch | blob | history

diff --git a/backup/restorelib.php b/backup/restorelib.php
index 90c913d6476595e209e01410d12ad873d34f7180..57a4aeffbe3fa7ff2d50d430961a3ef9faa625f9 100644 (file)
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -6361,9 +6361,8 @@
             $stylesheetshtml .= '<link rel="stylesheet" type="text/css" href="'.$stylesheet.'" />'."\n";
         }
         ///Accessibility: added the 'lang' attribute to $direction, used in theme <html> tag.
-        $language = str_replace('_utf8','',$CFG->lang);
-        $languagehtml = '';
-        $languagehtml .= ' lang="'.$language.'" xml:lang="'.$language.'"';
+        $languagehtml = get_html_lang($dir=true);
+
         //Write the header in the new logging file
         fwrite ($restorelog_file,"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"");
         fwrite ($restorelog_file," \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">  ");
@@ -6743,4 +6742,4 @@
            fclose($restorelog); 
         }
     }
-?>
+?>
\ No newline at end of file
diff --git a/lib/weblib.php b/lib/weblib.php
index f35afdace63d5f41267895cb2d18db95d0a48b03..a09d3f91e6c382fed0841a83c87660228f1fe986 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -1948,6 +1948,26 @@ function highlightfast($needle, $haystack) {
     return (join('', $parts));
 }
 
+/**
+ * Return a string containing 'lang', xml:lang and optionally 'dir' HTML attributes.
+ * Internationalisation, for print_header and backup/restorelib.
+ * @param $dir Default false.
+ * @return string Attributes.
+ */
+function get_html_lang($dir = false) {
+    $direction = '';
+    if ($dir) {
+        if (get_string('thisdirection') == 'rtl') {
+            $direction = ' dir="rtl"';
+        } else {
+            $direction = ' dir="ltr"';
+        }
+    }
+    //Accessibility: added the 'lang' attribute to $direction, used in theme <html> tag.
+    $language = str_replace('_', '-', str_replace('_utf8', '', current_language()));
+    return ($direction.' lang="'.$language.'" xml:lang="'.$language.'"'); 
+}
+
 
 /// STANDARD WEB PAGE PARTS ///////////////////////////////////////////////////
 
@@ -2082,14 +2102,8 @@ function print_header ($title='', $heading='', $navigation='', $focus='',
         @header('Content-type: text/html; charset=utf-8');
     }
 
-    if ( get_string('thisdirection') == 'rtl' ) {
-        $direction = ' dir="rtl"';
-    } else {
-        $direction = ' dir="ltr"';
-    }
     //Accessibility: added the 'lang' attribute to $direction, used in theme <html> tag.
-    $language = str_replace('_', '-', str_replace('_utf8', '', current_language()));
-    $direction .= ' lang="'.$language.'" xml:lang="'.$language.'"';
+    $direction = get_html_lang($dir=true);
 
     if ($cache) {  // Allow caching on "back" (but not on normal clicks)
         @header('Cache-Control: private, pre-check=0, post-check=0, max-age=0');
@@ -5674,4 +5688,4 @@ function frametarget() {
 }
 
 // vim:autoindent:expandtab:shiftwidth=4:tabstop=4:tw=140:
-?>
+?>
\ No newline at end of file
Unnamed repository; edit this file to name it for gitweb.