Pārlūkot izejas kodu

! Clean cache data after save core features [Bug 4955]

emanuele 13 gadi atpakaļ
vecāks
revīzija
9bbec860e1
1 mainītis faili ar 3 papildinājumiem un 13 dzēšanām
  1. 3 13
      Sources/ManageSettings.php

+ 3 - 13
Sources/ManageSettings.php

@@ -39,7 +39,7 @@ function loadGeneralSettingParameters($subActions = array(), $defaultAction = ''
 	$context['sub_template'] = 'show_settings';
 
 	// By default do the basic settings.
-	$_REQUEST['sa'] = isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']]) ? $_REQUEST['sa'] : (!empty($defaultAction) ? $defaultAction : array_pop($temp = array_keys($subActions)));
+	$_REQUEST['sa'] = isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']]) ? $_REQUEST['sa'] : (!empty($defaultAction) ? $defaultAction : array_pop(array_keys($subActions)));
 	$context['sub_action'] = $_REQUEST['sa'];
 }
 
@@ -63,14 +63,6 @@ function ModifyFeatureSettings()
 
 	call_integration_hook('integrate_modify_features', array(&$subActions));
 
-	// If Advanced Profile Fields are disabled don't show the setting page
-	if (!in_array('cp', $context['admin_features']))
-		unset($subActions['profile']);
-
-	// Same for Karma
-	if (!in_array('k', $context['admin_features']))
-		unset($subActions['karma']);
-
 	loadGeneralSettingParameters($subActions, 'basic');
 
 	// Load up all the tabs...
@@ -115,10 +107,6 @@ function ModifySecuritySettings()
 
 	call_integration_hook('integrate_modify_security', array(&$subActions));
 
-	// If Warning System is disabled don't show the setting page
-	if (!in_array('w', $context['admin_features']))
-		unset($subActions['moderation']);
-
 	loadGeneralSettingParameters($subActions, 'general');
 
 	// Load up all the tabs...
@@ -395,6 +383,8 @@ function ModifyCoreFeatures($return_config = false)
 
 		// Make any setting changes!
 		updateSettings($setting_changes);
+		// This is needed to let menus appear if cache > 2
+		clean_cache('data');
 
 		// Any post save things?
 		foreach ($core_features as $id => $feature)