Refs #2752, #2635. Merged r7299 to trunk.

git-svn-id: http://code.elgg.org/elgg/trunk@7792 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/cache.php b/engine/lib/cache.php
index 8fe7d35624ddb0d0d47079ed51cce3b08e69a2f7..72293022a4a545ec75dec00b02604286c8bd425d 100644 (file)
--- a/engine/lib/cache.php
+++ b/engine/lib/cache.php
@@ -32,49 +32,49 @@ function elgg_get_filepath_cache() {
 }
 
 /**
- * Deletes the view file paths cache from disk.
+ * Function which resets the file path cache.
  *
- * @return bool On success
  */
 function elgg_filepath_cache_reset() {
        $cache = elgg_get_filepath_cache();
-       return $cache->delete('view_paths');
+       $view_types_result = $cache->delete('view_types');
+       $views_result = $cache->delete('views');
+       return $view_types_result && $views_result;
 }
 
 /**
- * Saves $data to the views file paths disk cache as
- * 'view_paths'.
+ * Saves a filepath cache.
  *
- * @param mixed $data The data
- *
- * @return bool On success
+ * @param string $type
+ * @param string $data
+ * @return bool
  */
-function elgg_filepath_cache_save($data) {
+function elgg_filepath_cache_save($type, $data) {
        global $CONFIG;
 
        if ($CONFIG->viewpath_cache_enabled) {
                $cache = elgg_get_filepath_cache();
-               return $cache->save('view_paths', $data);
+               return $cache->save($type, $data);
        }
 
        return false;
 }
 
 /**
- * Returns the contents of the views file paths cache from disk.
+ * Retrieve the contents of the filepath cache.
  *
- * @return mixed Null if simplecache isn't enabled, the contents of the
- * views file paths cache if it is.
+ * @param string $type The type of cache to load
+ * @return string
  */
-function elgg_filepath_cache_load() {
+function elgg_filepath_cache_load($type) {
        global $CONFIG;
 
        if ($CONFIG->viewpath_cache_enabled) {
                $cache = elgg_get_filepath_cache();
-               $cached_view_paths = $cache->load('view_paths');
+               $cached_data = $cache->load($type);
 
-               if ($cached_view_paths) {
-                       return $cached_view_paths;
+               if ($cached_data) {
+                       return $cached_data;
                }
        }
 

diff --git a/engine/lib/views.php b/engine/lib/views.php
index 942f1b6a7c2474a87575f4dac0ba43d834811cc6..878db04d8229501c67170578b022ffd22831ca2f 100644 (file)
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -1620,7 +1620,7 @@ function elgg_views_boot() {
        elgg_register_event_handler('ready', 'system', 'elgg_views_register_core_head_elements');
 
        // discover the built-in view types
-       // @todo cache this
+       // @todo the cache is loaded in load_plugins() but we need to know view_types earlier
        $view_path = $CONFIG->viewpath;
 
        $views = scandir($view_path);