]> 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: a776c37)
fixed problems with forced course language
authorskodak <skodak>
Tue, 8 Feb 2005 21:30:47 +0000 (21:30 +0000)
committerskodak <skodak>
Tue, 8 Feb 2005 21:30:47 +0000 (21:30 +0000)
mod/chat/gui_header_js/index.php patch | blob | history
mod/chat/gui_sockets/index.php patch | blob | history

diff --git a/mod/chat/gui_header_js/index.php b/mod/chat/gui_header_js/index.php
index e3bec8cab887f0cd40f2d0e09be02069fe6c7d41..0fde491fa8340cf0c5973bcd5fc80424e39c1375 100644 (file)
--- a/mod/chat/gui_header_js/index.php
+++ b/mod/chat/gui_header_js/index.php
@@ -44,14 +44,14 @@
         $groupname = '';
     }
 
+    $strchat = get_string('modulename', 'chat'); // must be before current_language() in chat_login_user() to force course language!!!
+
     if (!$chat_sid = chat_login_user($chat->id, 'header_js', $groupid, $course, true)) {
         error('Could not log in to chat room!!');
     }
 
     $params = "chat_sid=$chat_sid";
 
-    $strchat = get_string('modulename', 'chat');
-
 ?>
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
@@ -66,7 +66,7 @@
   <frameset rows="0,0,*,50" border="0" framespacing="no" frameborder="no" marginwidth="2" marginheight="1">
    <frame src="../empty.php" name="empty" scrolling="no" marginwidth="0" marginheight="0">
    <frame src="jsupdate.php?<?php echo $params ?>" name="jsupdate" scrolling="no" marginwidth="0" marginheight="0">
-   <frame src="chatmsg.php" name="msg" scrolling="auto" marginwidth="2" marginheight="1">
+   <frame src="chatmsg.php?<?php echo $params ?>" name="msg" scrolling="auto" marginwidth="2" marginheight="1">
    <frame src="chatinput.php?<?php echo $params ?>" name="input" scrolling="no" marginwidth="2" marginheight="1">
   </frameset>
   <frame src="users.php?<?php echo $params ?>" name="users" scrolling="auto" marginwidth="5" marginheight="5">
diff --git a/mod/chat/gui_sockets/index.php b/mod/chat/gui_sockets/index.php
index fe83747720b12ccd09da1b6f0999ff3194ecb741..25e86aff4666e00dc90894a4e52afc60fc1f0bef 100644 (file)
--- a/mod/chat/gui_sockets/index.php
+++ b/mod/chat/gui_sockets/index.php
@@ -46,16 +46,14 @@
 
     chat_delete_old_users();
 
+    $strchat = get_string('modulename', 'chat'); // must be before current_language() in chat_login_user() to force course language!!!
+
     if (!$chat_sid = chat_login_user($chat->id, 'sockets', $groupid, $course)) {
         error('Could not log in to chat room!!');
     }
 
-
     $params = "chat_sid=$chat_sid&amp;groupid=$groupid";
 
-    $strchat = get_string("modulename", "chat");
-
-
 ?>
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
Unnamed repository; edit this file to name it for gitweb.