moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-10 11:26:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-41042 coursecat: better handle changes in coursecontact

Browse source
This commit is contained in:
Marina Glancy 2015-08-14 12:27:26 +08:00
parent ef176837dc
commit 0e0c8c0dd7
3 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/adminlib.php
View file

@ -4802,6 +4802,8 @@ class admin_setting_special_coursecontact extends admin_setting_pickroles {
parent::__construct('coursecontact', get_string('coursecontact', 'admin'), parent::__construct('coursecontact', get_string('coursecontact', 'admin'),
get_string('coursecontact_desc', 'admin'), get_string('coursecontact_desc', 'admin'),
array('editingteacher')); array('editingteacher'));
$this->set_updatedcallback(create_function('',
"cache::make('core', 'coursecontacts')->purge();"));
} }
} }

11
lib/coursecatlib.php
View file

@ -708,16 +708,7 @@ class coursecat implements renderable, cacheable_object, IteratorAggregate {
} }
$managerroles = explode(',', $CFG->coursecontact); $managerroles = explode(',', $CFG->coursecontact);
$cache = cache::make('core', 'coursecontacts'); $cache = cache::make('core', 'coursecontacts');
$cacheddata = $cache->get_many(array_merge(array('basic'), array_keys($courses))); $cacheddata = $cache->get_many(array_keys($courses));
// Check if cache was set for the current course contacts and it is not yet expired.
if (empty($cacheddata['basic']) || $cacheddata['basic']['roles'] !== $CFG->coursecontact ||
$cacheddata['basic']['lastreset'] < time() - self::CACHE_COURSE_CONTACTS_TTL) {
// Reset cache.
$keys = $DB->get_fieldset_select('course', 'id', '');
$cache->delete_many($keys);
$cache->set('basic', array('roles' => $CFG->coursecontact, 'lastreset' => time()));
$cacheddata = $cache->get_many(array_merge(array('basic'), array_keys($courses)));
}
$courseids = array(); $courseids = array();
foreach (array_keys($courses) as $id) { foreach (array_keys($courses) as $id) {
if ($cacheddata[$id] !== false) { if ($cacheddata[$id] !== false) {

1
lib/db/caches.php
View file

@ -179,6 +179,7 @@ $definitions = array(
'mode' => cache_store::MODE_APPLICATION, 'mode' => cache_store::MODE_APPLICATION,
'staticacceleration' => true, 'staticacceleration' => true,
'simplekeys' => true, 'simplekeys' => true,
'ttl' => 3600,
), ),
// Used to store data for repositories to avoid repetitive DB queries within one request. // Used to store data for repositories to avoid repetitive DB queries within one request.
'repositories' => array( 'repositories' => array(