From 9a589771170fc8a7e335250ca9ca4e5f2b75c854 Mon Sep 17 00:00:00 2001
From: Eric Chavaillaz <eric@hemmer.ch>
Date: Wed, 27 Jan 2016 13:54:22 +0100
Subject: [PATCH] [BUGFIX] Clear cache system icon is shown for non admin in
dev context
If the context is in development mode, the clear cache system icon
is always shown in the toolbar, even if the user is not an admin.
Resolves: #72964
Releases: master, 7.6, 6.2
Change-Id: I674df49fee14ded4b2190cca098ddf146047e5f0
Reviewed-on: https://review.typo3.org/46264
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
---
.../Backend/ToolbarItems/ClearCacheToolbarItem.php | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/typo3/sysext/backend/Classes/Backend/ToolbarItems/ClearCacheToolbarItem.php b/typo3/sysext/backend/Classes/Backend/ToolbarItems/ClearCacheToolbarItem.php
index 162f98043353..c9e9944be021 100644
--- a/typo3/sysext/backend/Classes/Backend/ToolbarItems/ClearCacheToolbarItem.php
+++ b/typo3/sysext/backend/Classes/Backend/ToolbarItems/ClearCacheToolbarItem.php
@@ -81,10 +81,13 @@ class ClearCacheToolbarItem implements ToolbarItemInterface
// 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
+ // or if the system runs in development mode (only for admins)
// 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())) {
+ if (
+ $backendUser->getTSConfigVal('options.clearCache.system')
+ || (GeneralUtility::getApplicationContext()->isDevelopment() && $backendUser->isAdmin())
+ || ((bool)$GLOBALS['TYPO3_CONF_VARS']['SYS']['clearCacheSystem'] === true && $backendUser->isAdmin())
+ ) {
$this->cacheActions[] = array(
'id' => 'system',
'title' => htmlspecialchars($languageService->sL('LLL:EXT:lang/locallang_core.xlf:flushSystemCachesTitle')),
--
GitLab