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

Merge branch 'MDL-35158-master' of git://github.com/grabs/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2012-11-20 12:28:49 +08:00
commit 7b83e3019d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
blocks/glossary_random/block_glossary_random.php
View File

@ -129,11 +129,6 @@ class block_glossary_random extends block_base {
$course = $this->page->course;
$modinfo = get_fast_modinfo($course);
$glossaryid = $this->config->glossary;
$cm = $modinfo->instances['glossary'][$glossaryid];
if (!has_capability('mod/glossary:view', context_module::instance($cm->id))) {
return '';
}
if (!isset($modinfo->instances['glossary'][$glossaryid])) {
// we can get here if the glossary has been deleted, so
@ -147,6 +142,12 @@ class block_glossary_random extends block_base {
return $this->content;
}
$cm = $modinfo->instances['glossary'][$glossaryid];
if (!has_capability('mod/glossary:view', context_module::instance($cm->id))) {
return '';
}
if (empty($this->config->cache)) {
$this->config->cache = '';
}