From: skodak <skodak>
Date: Mon, 13 Mar 2006 22:11:56 +0000 (+0000)
Subject: updated language detection
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=a3182bd7e782dbfe730f746bd0a77082fd31f185;p=moodle.git

updated language detection
---

diff --git a/question/format/qti2/format.php b/question/format/qti2/format.php
index 9c375c2043..53788268a6 100644
--- a/question/format/qti2/format.php
+++ b/question/format/qti2/format.php
@@ -1,4 +1,4 @@
-<?php  
+<?php  // $Id$
 require_once("$CFG->dirroot/question/format/qti2/qt_common.php");
 ////////////////////////////////////////////////////////////////////////////
 /// IMS QTI 2.0 FORMAT
@@ -117,8 +117,7 @@ class qformat_qti2 extends qformat_default {
         
         // assign the language for the export: by parameter, SESSION, USER, or the default of 'en'
         if (is_null($lang)) {
-            global $SESSION, $USER;
-            $lang = empty($SESSION->lang) ? (empty($USER->lang) ? 'en' : $USER->lang) : $SESSION->lang;
+            $lang = current_language();
         }
         $this->lang = $lang;