moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 09:56:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'wip-MDL-39526-m25' of git://github.com/samhemelryk/moodle

Browse source
This commit is contained in:
Damyon Wiese 2013-05-09 12:33:32 +08:00
commit 887e724796
8 changed files with 66 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

6
admin/cli/upgrade.php
View file

@ -151,6 +151,12 @@ if ($interactive) {
}
if ($version > $CFG->version) {
// We purge all of MUC's caches here.
// Caches are disabled for upgrade by CACHE_DISABLE_ALL so we must set the first arg to true.
// This ensures a real config object is loaded and the stores will be purged.
// This is the only way we can purge custom caches such as memcache or APC.
// Note: all other calls to caches will still used the disabled API.
cache_helper::purge_all(true);
upgrade_core($version, true);
}
set_config('release', $release);

7
admin/index.php
View file

@ -222,6 +222,13 @@ if ($cache) {
}
if ($version > $CFG->version) { // upgrade
// We purge all of MUC's caches here.
// Caches are disabled for upgrade by CACHE_DISABLE_ALL so we must set the first arg to true.
// This ensures a real config object is loaded and the stores will be purged.
// This is the only way we can purge custom caches such as memcache or APC.
// Note: all other calls to caches will still used the disabled API.
cache_helper::purge_all(true);
// We then purge the regular caches.
purge_all_caches();
$PAGE->set_pagelayout('maintenance');