1 files changed, 32 insertions, 39 deletions

diff --git a/engine/lib/cache.php b/engine/lib/cache.php
index 633c470eb..3116c1a9b 100644
--- a/engine/lib/cache.php
+++ b/engine/lib/cache.php
@@ -35,17 +35,11 @@ function elgg_get_system_cache() {
 /**
  * Reset the system cache by deleting the caches
  *
- * @return bool
+ * @return void
  */
 function elgg_reset_system_cache() {
 	$cache = elgg_get_system_cache();
-
-	$result = true;
-	$cache_types = array('view_paths', 'view_types');
-	foreach ($cache_types as $type) {
-		$result = $result && $cache->delete($type);
-	}
-	return $result;
+	$cache->clear();
 }
 
 /**
@@ -131,7 +125,7 @@ function elgg_get_filepath_cache() {
  * @access private
  */
 function elgg_filepath_cache_reset() {
-	return elgg_reset_system_cache();
+	elgg_reset_system_cache();
 }
 /**
  * @access private
@@ -149,13 +143,13 @@ function elgg_filepath_cache_load($type) {
  * @access private
  */
 function elgg_enable_filepath_cache() {
-	return elgg_enable_system_cache();
+	elgg_enable_system_cache();
 }
 /**
  * @access private
  */
 function elgg_disable_filepath_cache() {
-	return elgg_disable_system_cache();
+	elgg_disable_system_cache();
 }
 
 /* Simplecache */
@@ -214,6 +208,7 @@ function elgg_get_simplecache_url($type, $view) {
 	global $CONFIG;
 	$lastcache = (int)$CONFIG->lastcache;
 	$viewtype = elgg_get_viewtype();
+	elgg_register_simplecache_view("$type/$view");// see #5302
 	if (elgg_is_simplecache_enabled()) {
 		$url = elgg_get_site_url() . "cache/$type/$viewtype/$view.$lastcache.$type";
 	} else {
@@ -228,7 +223,7 @@ function elgg_get_simplecache_url($type, $view) {
 /**
  * Regenerates the simple cache.
  *
- * @warning This does not invalidate the cache, but actively resets it.
+ * @warning This does not invalidate the cache, but actively rebuilds it.
  *
  * @param string $viewtype Optional viewtype to regenerate. Defaults to all valid viewtypes.
  *
@@ -375,7 +370,7 @@ function elgg_invalidate_simplecache() {
 	$return = true;
 	while (false !== ($file = readdir($handle))) {
 		if ($file != "." && $file != "..") {
-			$return = $return && unlink($CONFIG->dataroot . 'views_simplecache/' . $file);
+			$return &= unlink($CONFIG->dataroot . 'views_simplecache/' . $file);
 		}
 	}
 	closedir($handle);
@@ -388,8 +383,8 @@ function elgg_invalidate_simplecache() {
 	}
 
 	foreach ($viewtypes as $viewtype) {
-		$return = $return && datalist_set("simplecache_lastupdate_$viewtype", 0);
-		$return = $return && datalist_set("simplecache_lastcached_$viewtype", 0);
+		$return &= datalist_set("simplecache_lastupdate_$viewtype", 0);
+		$return &= datalist_set("simplecache_lastcached_$viewtype", 0);
 	}
 
 	return $return;
@@ -401,26 +396,23 @@ function elgg_invalidate_simplecache() {
  */
 function _elgg_load_cache() {
 	global $CONFIG;
+
+	$CONFIG->system_cache_loaded = false;
+
+	$CONFIG->views = new stdClass();
+	$data = elgg_load_system_cache('view_locations');
+	if (!is_string($data)) {
+		return;
+	}
+	$CONFIG->views->locations = unserialize($data);
 	
-	$result = true;
-	$cache_types = array(
-		'view_paths' => 'views',
-		'view_types' => 'view_types',
-	);
-	$data = array();
-	foreach ($cache_types as $type => $var_name) {
-		$data[$var_name] = elgg_load_system_cache($type);
-		$result = $result && is_string($data[$var_name]);
+	$data = elgg_load_system_cache('view_types');
+	if (!is_string($data)) {
+		return;
 	}
+	$CONFIG->view_types = unserialize($data);
 
-	if ($result) {
-		$CONFIG->system_cache_loaded = true;
-		foreach ($data as $name => $value) {
-			$CONFIG->$name = unserialize($value);
-		}
-	} else {
-		$CONFIG->system_cache_loaded = false;
-	}
+	$CONFIG->system_cache_loaded = true;
 }
 
 /**
@@ -446,13 +438,14 @@ function _elgg_cache_init() {
 
 	// cache system data if enabled and not loaded
 	if ($CONFIG->system_cache_enabled && !$CONFIG->system_cache_loaded) {
-		$cache_types = array(
-			'view_paths' => 'views',
-			'view_types' => 'view_types',
-		);
-		$data = array();
-		foreach ($cache_types as $type => $var_name) {
-			elgg_save_system_cache($type, serialize($CONFIG->$var_name));
+		elgg_save_system_cache('view_locations', serialize($CONFIG->views->locations));
+		elgg_save_system_cache('view_types', serialize($CONFIG->view_types));
+	}
+
+	if ($CONFIG->system_cache_enabled && !$CONFIG->i18n_loaded_from_cache) {
+		reload_all_translations();
+		foreach ($CONFIG->translations as $lang => $map) {
+			elgg_save_system_cache("$lang.lang", serialize($map));
 		}
 	}
 }