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

Merged tag block context fixes from stable

Browse Source
This commit is contained in:
moodler 2006-06-19 14:17:55 +00:00
parent adc7b679aa
commit 25fb38d465
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
blocks/blog_tags/block_blog_tags.php
View File

@ -41,7 +41,7 @@ class block_blog_tags extends block_base {
function get_content() {
global $CFG;
global $CFG, $SITE, $COURSE;
if (empty($this->config->timewithin)) {
$this->config->timewithin = BLOGDEFAULTTIMEWITHIN;
@ -131,17 +131,21 @@ class block_blog_tags extends block_base {
case BLOG_COURSE_LEVEL:
$filtertype = 'course';
global $course; // Need to do this unfortunately for pages like blog pages
if (isset($course->id)) {
$filterselect = $course->id;
if (isset($COURSE->id)) {
$filterselect = $COURSE->id;
} else {
$filterselect = $this->instance->pageid;
}
break;
default:
$filtertype = 'site';
$filterselect = SITEID;
if (isset($COURSE->id) && $COURSE->id != SITEID) {
$filtertype = 'course';
$filterselect = $COURSE->id;
} else {
$filtertype = 'site';
$filterselect = SITEID;
}
break;
}