mirror of
https://github.com/moodle/moodle.git
synced 2025-01-18 22:08:20 +01:00
Merge branch 'MDL-46868' of git://github.com/timhunt/moodle
This commit is contained in:
commit
af0646139c
@ -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.
|
||||
|
Loading…
x
Reference in New Issue
Block a user