aboutsummaryrefslogtreecommitdiff
path: root/engine/lib/configuration.php
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2012-01-24 17:59:12 -0800
committerCash Costello <cash.costello@gmail.com>2012-01-24 17:59:12 -0800
commit618263935a0b01bcef7a94153a41be1a6170154a (patch)
tree99c04314de2b669e8aef22c61ffa24f9aa6b14c5 /engine/lib/configuration.php
parent54bef9fc0b85acaf6950e618bd02aa50befd2acc (diff)
parent7c962fa6cbaf687daafb8588ff601fe664e1392c (diff)
downloadelgg-618263935a0b01bcef7a94153a41be1a6170154a.tar.gz
elgg-618263935a0b01bcef7a94153a41be1a6170154a.tar.bz2
Merge pull request #151 from cash/system_cache
Turn viewpath cache into a system cache
Diffstat (limited to 'engine/lib/configuration.php')
-rw-r--r--engine/lib/configuration.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/lib/configuration.php b/engine/lib/configuration.php
index cccd69105..772c24930 100644
--- a/engine/lib/configuration.php
+++ b/engine/lib/configuration.php
@@ -599,11 +599,11 @@ function _elgg_load_application_config() {
} else {
$CONFIG->simplecache_enabled = 1;
}
- $viewpath_cache_enabled = datalist_get('viewpath_cache_enabled');
- if ($viewpath_cache_enabled !== false) {
- $CONFIG->viewpath_cache_enabled = $viewpath_cache_enabled;
+ $system_cache_enabled = datalist_get('system_cache_enabled');
+ if ($system_cache_enabled !== false) {
+ $CONFIG->system_cache_enabled = $system_cache_enabled;
} else {
- $CONFIG->viewpath_cache_enabled = 1;
+ $CONFIG->system_cache_enabled = 1;
}
// initialize context here so it is set before the get_input call