L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed capabilities in chat recent activity, removed broken optimization from message insert, fixed closing of box MDL-7313; merged from MOODLE_17_STABLE

Browse Source
This commit is contained in:
skodak
2006-10-31 21:07:00 +00:00
parent 6f4bdb9c9b
commit 80aede31d3
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/chat/gui_header_js/insert.php
+1 -1
View File
@@ -14,7 +14,7 @@
error('No chat found');
}
if (!$course = get_record('course', 'id', $chat->course, '', '', '','', 'id, shortname')) {
if (!$course = get_record('course', 'id', $chat->course)) {
error('Could not find the course this belongs to!');
}
mod/chat/lib.php
+2 -7
View File
@@ -199,12 +199,7 @@ function chat_print_recent_activity($course, $isteacher, $timestart) {
if ($chat = get_record('chat', 'id', $chatuser->chatid)) {
// we find the course module id
$chatmod = get_record('modules', 'name', 'chat');
$SQL = "select * from {$CFG->prefix}course_modules where
course = $course->id
and module = $chatmod->id
and instance = $chat->id";
$cm = get_records_sql($SQL);
$cm = get_coursemodule_from_instance('chat', $chat->id, $course->id);
$context = get_context_instance(CONTEXT_MODULE, $cm->id);
// needs to be fixed
@@ -219,7 +214,7 @@ function chat_print_recent_activity($course, $isteacher, $timestart) {
}
$current = $chatuser->chatid;
}
$fullname = fullname($chatuser, has_capability('moodle/site:viewfullnames', get_context_instance(CONTEXT_MODULE, $cm->id)));
$fullname = fullname($chatuser, has_capability('moodle/site:viewfullnames', get_context_instance(CONTEXT_COURSE, $course->id)));
echo '<li class="info name">'.$fullname.'</li>';
}
mod/chat/report.php
+1 -1
View File
@@ -79,7 +79,7 @@
echo $formatmessage->html;
}
}
print_simple_box_end('center');
print_simple_box_end();
}
if (!$deletesession or !has_capability('mod/chat:deletelog', $context)) {