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 /engine/lib/plugins.php | |
| 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 'engine/lib/plugins.php')
| -rw-r--r-- | engine/lib/plugins.php | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/engine/lib/plugins.php b/engine/lib/plugins.php index 7968f4a6e..07b21d276 100644 --- a/engine/lib/plugins.php +++ b/engine/lib/plugins.php @@ -301,16 +301,7 @@ function elgg_load_plugins() { return false; } - // Load view caches if available - $cached_view_paths = elgg_filepath_cache_load('views'); - $cached_view_types = elgg_filepath_cache_load('view_types'); - $cached_view_info = is_string($cached_view_paths) && is_string($cached_view_types); - - if ($cached_view_info) { - $CONFIG->views = unserialize($cached_view_paths); - $CONFIG->view_types = unserialize($cached_view_types); - - // don't need to register views + if (elgg_get_config('system_cache_loaded')) { $start_flags = $start_flags & ~ELGG_PLUGIN_REGISTER_VIEWS; } @@ -332,12 +323,6 @@ function elgg_load_plugins() { } } - // Cache results - if (!$cached_view_info) { - elgg_filepath_cache_save('views', serialize($CONFIG->views)); - elgg_filepath_cache_save('view_types', serialize($CONFIG->view_types)); - } - return $return; } |