diff options
| author | Cash Costello <cash.costello@gmail.com> | 2012-01-24 17:59:12 -0800 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2012-01-24 17:59:12 -0800 |
| commit | 618263935a0b01bcef7a94153a41be1a6170154a (patch) | |
| tree | 99c04314de2b669e8aef22c61ffa24f9aa6b14c5 /actions/admin/site | |
| parent | 54bef9fc0b85acaf6950e618bd02aa50befd2acc (diff) | |
| parent | 7c962fa6cbaf687daafb8588ff601fe664e1392c (diff) | |
| download | elgg-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 'actions/admin/site')
| -rw-r--r-- | actions/admin/site/flush_cache.php | 2 | ||||
| -rw-r--r-- | actions/admin/site/update_advanced.php | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/actions/admin/site/flush_cache.php b/actions/admin/site/flush_cache.php index b81f5fc83..ebb8296c7 100644 --- a/actions/admin/site/flush_cache.php +++ b/actions/admin/site/flush_cache.php @@ -4,7 +4,7 @@ */ elgg_invalidate_simplecache(); -elgg_filepath_cache_reset(); +elgg_reset_system_cache(); system_message(elgg_echo('admin:cache:flushed')); forward(REFERER);
\ No newline at end of file diff --git a/actions/admin/site/update_advanced.php b/actions/admin/site/update_advanced.php index 12c5542e7..23d622a62 100644 --- a/actions/admin/site/update_advanced.php +++ b/actions/admin/site/update_advanced.php @@ -25,10 +25,10 @@ if ($site = elgg_get_site_entity()) { elgg_disable_simplecache(); } - if (get_input('viewpath_cache_enabled')) { - elgg_enable_filepath_cache(); + if (get_input('system_cache_enabled')) { + elgg_enable_system_cache(); } else { - elgg_disable_filepath_cache(); + elgg_disable_system_cache(); } set_config('default_access', get_input('default_access', ACCESS_PRIVATE), $site->getGUID()); |