L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-35158-23' of git://github.com/grabs/moodle into MOODLE_23_STABLE

Browse Source
This commit is contained in:
Dan Poltawski
2012-11-20 12:28:59 +08:00
parent 042a79870c 8199b8748e
commit aaf19f1ca3
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blocks/glossary_random/block_glossary_random.php
+6 -5
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', get_context_instance(CONTEXT_MODULE, $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', get_context_instance(CONTEXT_MODULE, $cm->id))) {
return '';
}
if (empty($this->config->cache)) {
$this->config->cache = '';
}