From 75868f14ba9fd4df6925d03bf614405413800f72 Mon Sep 17 00:00:00 2001
From: marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 8 Apr 2009 16:05:28 +0000
Subject: Refs #968 & #946: Tidied filepath cache stuff by placing them in
 function calls.

git-svn-id: https://code.elgg.org/elgg/trunk@3194 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/plugins.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'engine/lib/plugins.php')

diff --git a/engine/lib/plugins.php b/engine/lib/plugins.php
index 0a373457e..771fe7306 100644
--- a/engine/lib/plugins.php
+++ b/engine/lib/plugins.php
@@ -192,7 +192,11 @@
 				
 				$plugins = serialize($plugins);
 				
-				$site->pluginorder = $plugins;
+				$site->pluginorder = $plugins;
+				
+				// Regenerate caches
+				elgg_view_regenerate_simplecache();
+				elgg_filepath_cache_reset();
 				
 				return $plugins;
 					
@@ -213,13 +217,11 @@
 		function load_plugins() {
 			
 			global $CONFIG;
-			
-			$cache = elgg_get_filepath_cache();
 			
 			if (!empty($CONFIG->pluginspath)) {
 				
 				// See if we have cached values for things
-				$cached_view_paths = $cache->load('view_paths'); 
+				$cached_view_paths = elgg_filepath_cache_load();
 				if ($cached_view_paths) $CONFIG->views = unserialize($cached_view_paths);
 				
 				// temporary disable all plugins if there is a file called 'disabled' in the plugin dir
@@ -259,7 +261,7 @@
 
 				// Cache results
 				if (!$cached_view_paths)
-					$cache->save('view_paths', serialize($CONFIG->views));
+					elgg_filepath_cache_save(serialize($CONFIG->views));
 			}
 			
 		}
-- 
cgit v1.2.3