aboutsummaryrefslogtreecommitdiff
path: root/engine/lib/plugins.php
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2012-01-21 13:33:40 -0500
committerCash Costello <cash.costello@gmail.com>2012-01-21 13:33:40 -0500
commit7c962fa6cbaf687daafb8588ff601fe664e1392c (patch)
tree73f74da6403ad9d17edc055d6286faec2c7b442a /engine/lib/plugins.php
parentb466d3e188a001f8d7ede1afbf3927c6dbdeae15 (diff)
downloadelgg-7c962fa6cbaf687daafb8588ff601fe664e1392c.tar.gz
elgg-7c962fa6cbaf687daafb8588ff601fe664e1392c.tar.bz2
moved cache loading out of plugin code
Diffstat (limited to 'engine/lib/plugins.php')
-rw-r--r--engine/lib/plugins.php17
1 files changed, 1 insertions, 16 deletions
diff --git a/engine/lib/plugins.php b/engine/lib/plugins.php
index d9c7b321b..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_load_system_cache('view_paths');
- $cached_view_types = elgg_load_system_cache('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_save_system_cache('view_paths', serialize($CONFIG->views));
- elgg_save_system_cache('view_types', serialize($CONFIG->view_types));
- }
-
return $return;
}