[BUGFIX] Fix the remove expired pages button

Change-Id: I627b74ff09c05eb668102772d8bb4aaebafb5c2b

diff --git a/Classes/Module/CacheModule.php b/Classes/Module/CacheModule.php
index 5012c07..a32251a 100644 (file)
--- a/Classes/Module/CacheModule.php
+++ b/Classes/Module/CacheModule.php
@@ -131,7 +131,7 @@ class CacheModule extends AbstractFunctionModule
     {
         $action = GeneralUtility::_GP('ACTION');
 
-        if (isset($action['removeExpiredPages'])) {
+        if (isset($action['removeExpiredPages']) && (bool)$action['removeExpiredPages']) {
             CacheUtility::getCache()
                 ->collectGarbage();
         }

diff --git a/Documentation/ChangeLog/Index.rst b/Documentation/ChangeLog/Index.rst
index 6b38ca5..e660250 100644 (file)
--- a/Documentation/ChangeLog/Index.rst
+++ b/Documentation/ChangeLog/Index.rst
@@ -12,6 +12,7 @@ ChangeLog
 - [TASK] Convert array to short syntax (need PHP 5.4.x)
 - [BUGFIX] #70673 No static file after FE user logged out
 - [BUGFIX] #70994 Tree view in info module just one entry (TYPO3 7.x)
+- [BUGFIX] Fix the remove expired pages button
 
 2015-09-09 Tim Lochmüller <tim@fruit-lab.de>
 

diff --git a/Resources/Private/Templates/Module.html b/Resources/Private/Templates/Module.html
index 6f3f35e..5d33ace 100644 (file)
--- a/Resources/Private/Templates/Module.html
+++ b/Resources/Private/Templates/Module.html
@@ -1,11 +1,12 @@
 <h1>Static file cache</h1>
 <p>
-       <button type="submit" class="btn btn-default" onclick="return confirm('Are you sure?');" value="" name="ACTION[removeExpiredPages]">
+
+       <a href="{requestUri}&ACTION[removeExpiredPages]=1" class="btn btn-default" onclick="return confirm('Are you sure?');">
                <f:be.buttons.icon icon="actions-edit-delete" />
                Remove all expired pages
-       </button>
-       <a href="{requestUri}" class="btn btn-default">
-               <f:be.buttons.icon icon="actions-system-refresh" title="{f:translate(key: 'LLL:EXT:lang/locallang_core.xml:labels.refresh')}" />
+       </a>
+       <a href="{requestUri}&ACTION[removeExpiredPages]=0" class="btn btn-default">
+               <f:be.buttons.icon icon="actions-system-refresh" />
                {f:translate(key: 'LLL:EXT:lang/locallang_core.xml:labels.refresh')}
        </a>
 </p>