From f66a4db61333a13132d761e8e3966faec7f339f2 Mon Sep 17 00:00:00 2001
From: Zbigniew Jacko <z.jacko@macopedia.pl>
Date: Wed, 11 Jun 2014 11:04:46 +0200
Subject: [PATCH] [TASK] Activate 'Flush system caches' with Preset
'Development'
Add a new configuration in Install Tool (['SYS']['clearCacheSystem']).
If set, the toolbar of clearing system cache is visible (only for
admin users).
Add it also for Configuration Preset. For Production it is set to FALSE,
for Development it is set to TRUE.
Resolves: #57230
Releases: 6.2
Change-Id: Id45496c6bc1e64b4454ed7ff78e8db1179387b0f
Reviewed-on: https://review.typo3.org/30656
Reviewed-by: Krzysztof Adamczyk
Tested-by: Krzysztof Adamczyk
Reviewed-by: Xavier Perseguers
Tested-by: Xavier Perseguers
---
.../sysext/backend/Classes/Toolbar/ClearCacheToolbarItem.php | 4 +++-
typo3/sysext/core/Classes/DataHandling/DataHandler.php | 3 ++-
typo3/sysext/core/Configuration/DefaultConfiguration.php | 1 +
.../install/Classes/Configuration/Context/CustomPreset.php | 1 +
.../Classes/Configuration/Context/DevelopmentPreset.php | 1 +
.../Classes/Configuration/Context/ProductionPreset.php | 1 +
6 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/typo3/sysext/backend/Classes/Toolbar/ClearCacheToolbarItem.php b/typo3/sysext/backend/Classes/Toolbar/ClearCacheToolbarItem.php
index 3ea426e3d344..3d2f0ec304da 100644
--- a/typo3/sysext/backend/Classes/Toolbar/ClearCacheToolbarItem.php
+++ b/typo3/sysext/backend/Classes/Toolbar/ClearCacheToolbarItem.php
@@ -100,7 +100,9 @@ class ClearCacheToolbarItem implements ToolbarItemHookInterface {
// Clearing of system cache (core cache, class cache etc)
// is only shown explicitly if activated for a BE-user (not activated for admins by default)
// or if the system runs in development mode
- if ($backendUser->getTSConfigVal('options.clearCache.system') || GeneralUtility::getApplicationContext()->isDevelopment()) {
+ // or if $GLOBALS['TYPO3_CONF_VARS']['SYS']['clearCacheSystem'] is set (only for admins)
+ if ($backendUser->getTSConfigVal('options.clearCache.system') || GeneralUtility::getApplicationContext()->isDevelopment()
+ || ((bool) $GLOBALS['TYPO3_CONF_VARS']['SYS']['clearCacheSystem'] === TRUE && $backendUser->isAdmin())) {
$this->cacheActions[] = array(
'id' => 'system',
'title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:flushSystemCachesTitle', TRUE),
diff --git a/typo3/sysext/core/Classes/DataHandling/DataHandler.php b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
index b7f5284c70c3..41f93e2fb111 100644
--- a/typo3/sysext/core/Classes/DataHandling/DataHandler.php
+++ b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
@@ -7166,7 +7166,8 @@ class DataHandler {
break;
case 'temp_cached':
case 'system':
- if ($this->admin || $this->BE_USER->getTSConfigVal('options.clearCache.system')) {
+ if ($this->admin || $this->BE_USER->getTSConfigVal('options.clearCache.system')
+ || ((bool) $GLOBALS['TYPO3_CONF_VARS']['SYS']['clearCacheSystem'] === TRUE && $this->admin)) {
GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Cache\\CacheManager')->flushCachesInGroup('system');
}
break;
diff --git a/typo3/sysext/core/Configuration/DefaultConfiguration.php b/typo3/sysext/core/Configuration/DefaultConfiguration.php
index 0d6556a565ce..86abdeab99f1 100644
--- a/typo3/sysext/core/Configuration/DefaultConfiguration.php
+++ b/typo3/sysext/core/Configuration/DefaultConfiguration.php
@@ -256,6 +256,7 @@ return array(
)
),
'isInitialInstallationInProgress' => FALSE, // Boolean: If TRUE, the installation is 'in progress'. This value is handled within the install tool step installer internally.
+ 'clearCacheSystem' => FALSE, // Boolean: If set, the toolbar menu entry for clearing system caches (core cache, class cache, etc.) is visible for admin users.
),
'EXT' => array( // Options related to the Extension Management
'allowGlobalInstall' => FALSE, // Boolean: If set, global extensions in typo3/ext/ are allowed to be installed, updated and deleted etc.
diff --git a/typo3/sysext/install/Classes/Configuration/Context/CustomPreset.php b/typo3/sysext/install/Classes/Configuration/Context/CustomPreset.php
index a7c24466d736..351a413ea9b7 100644
--- a/typo3/sysext/install/Classes/Configuration/Context/CustomPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/Context/CustomPreset.php
@@ -42,5 +42,6 @@ class CustomPreset extends Configuration\AbstractCustomPreset implements Configu
'SYS/enableDeprecationLog' => '',
'SYS/sqlDebug' => '',
'SYS/systemLogLevel' => '',
+ 'SYS/clearCacheSystem' => '',
);
}
diff --git a/typo3/sysext/install/Classes/Configuration/Context/DevelopmentPreset.php b/typo3/sysext/install/Classes/Configuration/Context/DevelopmentPreset.php
index 2a8bce66ce94..000608f6c386 100644
--- a/typo3/sysext/install/Classes/Configuration/Context/DevelopmentPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/Context/DevelopmentPreset.php
@@ -54,6 +54,7 @@ class DevelopmentPreset extends Configuration\AbstractPreset {
'SYS/systemLogLevel' => 0,
// E_WARNING | E_RECOVERABLE_ERROR | E_DEPRECATED | E_USER_DEPRECATED
'SYS/exceptionalErrors' => 28674,
+ 'SYS/clearCacheSystem' => TRUE,
);
/**
diff --git a/typo3/sysext/install/Classes/Configuration/Context/ProductionPreset.php b/typo3/sysext/install/Classes/Configuration/Context/ProductionPreset.php
index 7b79153531ec..6a7332f8e5af 100644
--- a/typo3/sysext/install/Classes/Configuration/Context/ProductionPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/Context/ProductionPreset.php
@@ -52,6 +52,7 @@ class ProductionPreset extends Configuration\AbstractPreset {
'SYS/enableDeprecationLog' => FALSE,
'SYS/sqlDebug' => 0,
'SYS/systemLogLevel' => 2,
+ 'SYS/clearCacheSystem' => FALSE,
);
/**
--
GitLab