mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-25 10:00:31 +01:00
Code Issues Projects Releases Wiki Activity

lib/setup: restore sanity to rcache handling

Browse Source 
$CFG->rcache is safe to keep, even as we are reading the config table.

This is because whenever we update the config table, all the rcache
plugins either mark the cache as dirty or they update the cache.

The reason we want to be able to preserve this is that rcache settings
in CFG should usually be set in config.php rather than in the config
table.

With this fix, we support both control points.
This commit is contained in:
martinlanghoff 2008-01-06 22:56:07 +00:00
parent 944a2c938f
commit b1df0eb2ce
1 changed files with 1 additions and 4 deletions

5
lib/setup.php

@ -211,7 +211,6 @@ global $HTTPSPAGEREQUIRED;
configure_dbconnection();
/// Load up any configuration from the config table
unset($CFG->rcache);
$CFG = get_config();
/// Turn on SQL logging if required
@ -286,9 +285,7 @@ global $HTTPSPAGEREQUIRED;
/// Ensure we define rcache - so we can later check for it
/// with a really fast and unambiguous $CFG->rcache === false
if (!empty($CFG->cachetype)) {
if (array_key_exists('rcache', $CFG->config_php_settings)) {
$CFG->rcache = (bool)$CFG->config_php_settings['rcache']; // always use config.php setting if present
} else if (empty($CFG->rcache)) {
if (empty($CFG->rcache)) {
$CFG->rcache = false;
} else {
$CFG->rcache = true;