From: dongsheng Date: Tue, 2 Jun 2009 05:24:24 +0000 (+0000) Subject: "MDL-14651, fixed yui javascript path (since latest yui upgrade), setup in update... X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=cc852a0a8db6a180f3fcb183100147fa19ad43cd;p=moodle.git "MDL-14651, fixed yui javascript path (since latest yui upgrade), setup in update script in order to get format_text worked" --- diff --git a/mod/chat/gui_ajax/index.php b/mod/chat/gui_ajax/index.php index c949dc80da..210fcf8763 100644 --- a/mod/chat/gui_ajax/index.php +++ b/mod/chat/gui_ajax/index.php @@ -69,7 +69,7 @@ print_js_config(array('home'=>$CFG->httpswwwroot.'/mod/chat/view.php?id='.$cm->i print_js_config(array('send'=>$str_send, 'sending'=>$str_sending, 'inputarea'=>$str_inputarea, 'userlist'=>$str_userlist), 'chat_lang'); ?> - + @@ -77,11 +77,11 @@ print_js_config(array('send'=>$str_send, 'sending'=>$str_sending, 'inputarea'=>$ - + diff --git a/mod/chat/gui_ajax/update.php b/mod/chat/gui_ajax/update.php index 3ad91792e9..26442f9e92 100755 --- a/mod/chat/gui_ajax/update.php +++ b/mod/chat/gui_ajax/update.php @@ -44,9 +44,15 @@ if (!$USER = $DB->get_record('user', array('id'=>$chatuser->userid))) { chat_print_error('ERROR', get_string('invaliduserid', 'error')); } +if (!$chat = $DB->get_record('chat', array('id'=>$chatuser->chatid))) { + chat_print_error('ERROR', get_string('invalidcoursemodule', 'error')); +} + if (!$cm = get_coursemodule_from_instance('chat', $chatuser->chatid, $course->id)) { chat_print_error('ERROR', get_string('invalidcoursemodule', 'error')); } +// setup $PAGE so that format_text will work properly +$PAGE->set_cm($cm, $course, $chat); if($CFG->chat_use_cache){ $cache = new file_cache();