Merged r6701:6756 from 1.7 branch into trunk

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

1 files changed, 3 insertions, 8 deletions

diff --git a/engine/lib/plugins.php b/engine/lib/plugins.php
index b8cf5c2d2..66b22a0aa 100644
--- a/engine/lib/plugins.php
+++ b/engine/lib/plugins.php
@@ -131,10 +131,10 @@ function get_plugin_list() {
  * @param array $pluginorder Optionally, a list of existing plugins and their orders
  * @return array The new list of plugins and their orders
  */
-function regenerate_plugin_list($pluginorder = false) {
+function regenerate_plugin_list($pluginorder = FALSE) {
 	global $CONFIG;
 
-	$CONFIG->pluginlistcache = null;
+	$CONFIG->pluginlistcache = NULL;
 
 	if ($site = get_entity($CONFIG->site_guid)) {
 		if (empty($pluginorder)) {
@@ -187,15 +187,10 @@ function regenerate_plugin_list($pluginorder = false) {
 
 		$site->pluginorder = $plugins;
 
-		// Regenerate caches
-		elgg_view_regenerate_simplecache();
-		elgg_filepath_cache_reset();
-
 		return $plugins;
-
 	}
 
-	return false;
+	return FALSE;
 }