mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 05:58:34 +01:00
Code Issues Projects Releases Wiki Activity

Fixed a bug just introduced before in the event type selection screen.

Browse Source
This commit is contained in:
defacer 2004-05-24 12:23:08 +00:00
parent eb15f829b6
commit 0d5d9de2ba
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
calendar/event.php
View File

@ -188,15 +188,11 @@
if(empty($focus)) $focus = '';
// Let's see if we are supposed to provide a referring course link
// but NOT for the front page
if (!empty($SESSION->cal_course_referer)) {
if ($course = get_record('course', 'id', $SESSION->cal_course_referer)) {
$shortname = $course->shortname;
$nav = '<a href="'.$CFG->wwwroot.'/course/view.php?id='.$SESSION->cal_course_referer.'">'.$shortname.'</a> -> '.$nav;
}
} else {
$nav = '';
// but NOT for the "main page" course
if($SESSION->cal_course_referer > 1 &&
($shortname = get_field('course', 'shortname', 'id', $SESSION->cal_course_referer)) !== false) {
// If we know about the referring course, show a return link
$nav = '<a href="'.$CFG->wwwroot.'/course/view.php?id='.$SESSION->cal_course_referer.'">'.$shortname.'</a> -> '.$nav;
}
print_header(get_string('calendar', 'calendar').': '.$title, $site->fullname, $nav.' -> '.$title,
@ -294,16 +290,10 @@
$form->timestart = time();
}
if(!isset($_REQUEST['type'])) {
// We don't know what kind of event we want
calendar_get_allowed_types($allowed);
if(!$allowed->groups && !$allowed->courses && !$allowed->site) {
// Take the shortcut
$_REQUEST['type'] = 'user';
}
else {
$_REQUEST['type'] = 'select';
}
calendar_get_allowed_types($allowed);
if(!$allowed->groups && !$allowed->courses && !$allowed->site) {
// Take the shortcut
$_REQUEST['type'] = 'user';
}
$header = '';