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

Merge branch 'MDL-46868_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2014-08-26 01:40:48 +02:00
parent 0047e4612c 6527b097e8
commit 3fda0a9736
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/glossary/classes/local/concept_cache.php
+8 -2
View File
@@ -159,6 +159,14 @@ class concept_cache {
$courseid = (int)$courseid;
// Get info on any glossaries in this course.
$modinfo = get_fast_modinfo($courseid);
$cminfos = $modinfo->get_instances_of('glossary');
if (!$cminfos) {
// No glossaries in this course, so don't do any work.
return array(array(), array());
}
$cache = \cache::make('mod_glossary', 'concepts');
$data = $cache->get($courseid);
if (is_array($data)) {
@@ -201,8 +209,6 @@ class concept_cache {
$concepts = $allconcepts;
// Verify access control to glossary instances.
$modinfo = get_fast_modinfo($courseid);
$cminfos = $modinfo->get_instances_of('glossary');
foreach ($concepts as $modid => $unused) {
if (!isset($cminfos[$modid])) {
// This should not happen.