mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-14 13:02:07 +02:00
Code Issues Projects Releases Wiki Activity

IFxed some notices when the block was used on sticky blocks page. MDL-6620

Browse Source
This commit is contained in:
moodler 2006-09-30 08:22:17 +00:00
parent 4fae686bc2
commit d4484f3209
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
blocks/admin/block_admin.php
View File

@ -8,7 +8,7 @@ class block_admin extends block_list {
function get_content() {
global $CFG, $USER;
global $CFG, $USER, $SITE;
if ($this->content !== NULL) {
return $this->content;
@ -25,10 +25,17 @@ class block_admin extends block_list {
return $this->content = '';
}
if (!empty($this->instance->pageid)) {
$context = get_context_instance(CONTEXT_COURSE, $this->instance->pageid);
}
$course = get_record('course', 'id', $this->instance->pageid);
if (empty($context)) {
$context = get_context_instance(CONTEXT_SYSTEM);
}
$context = get_context_instance(CONTEXT_COURSE, $this->instance->pageid);
if (!$course = get_record('course', 'id', $this->instance->pageid)) {
$course = $SITE;
}
if (!has_capability('moodle/course:view', $context)) { // Just return
return $this->content;