Merge branch 'MDL-45560-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE

This commit is contained in:
Marina Glancy 2014-06-09 17:25:22 +08:00
commit a9af7d94e1

View file

@ -135,7 +135,6 @@ $adminediting = optional_param('adminedit', -1, PARAM_BOOL);
if ($PAGE->user_allowed_editing() && $adminediting != -1) {
$USER->editing = $adminediting;
}
\core\session\manager::write_close();
if (!empty($chooselog)) {
$userinfo = get_string('allparticipants');
@ -175,6 +174,7 @@ if (!empty($chooselog)) {
}
break;
case 'downloadascsv':
\core\session\manager::write_close();
if (!print_log_csv($course, $user, $date, 'l.time DESC', $modname,
$modid, $modaction, $group)) {
echo $OUTPUT->notification("No logs found!");
@ -182,6 +182,7 @@ if (!empty($chooselog)) {
}
exit;
case 'downloadasods':
\core\session\manager::write_close();
if (!print_log_ods($course, $user, $date, 'l.time DESC', $modname,
$modid, $modaction, $group)) {
echo $OUTPUT->notification("No logs found!");
@ -189,6 +190,7 @@ if (!empty($chooselog)) {
}
exit;
case 'downloadasexcel':
\core\session\manager::write_close();
if (!print_log_xls($course, $user, $date, 'l.time DESC', $modname,
$modid, $modaction, $group)) {
echo $OUTPUT->notification("No logs found!");