[BUGFIX] Disabling the cache does not work on invalid cHash value

Change-Id: I9df3d7b4bf1d565fc5a429bad6ee2d3d186f6044
Releases: 4.6, 4.5, 4.4, 4.3
Resolves: #29366
Reviewed-on: http://review.typo3.org/4705
Reviewed-by: Oliver Hader
Tested-by: Oliver Hader
Reviewed-by: Tolleiv Nietsch
Tested-by: Tolleiv Nietsch

diff --git a/typo3/sysext/cms/tslib/class.tslib_fe.php b/typo3/sysext/cms/tslib/class.tslib_fe.php
index 153957a..4a7db7f 100644 (file)
--- a/typo3/sysext/cms/tslib/class.tslib_fe.php
+++ b/typo3/sysext/cms/tslib/class.tslib_fe.php
@@ -1748,7 +1748,7 @@
                                if ($this->TYPO3_CONF_VARS['FE']['pageNotFoundOnCHashError']) {
                                        $this->pageNotFoundAndExit('Request parameters could not be validated (&cHash comparison failed)');
                                } else {
-                                       $this->set_no_cache();
+                                       $this->disableCache();
                                        $GLOBALS['TT']->setTSlogMessage('The incoming cHash "'.$this->cHash.'" and calculated cHash "'.$cHash_calc.'" did not match, so caching was disabled. The fieldlist used was "'.implode(',',array_keys($this->cHash_array)).'"',2);
                                }
                        }
@@ -1768,7 +1768,7 @@
                                if ($this->tempContent) { $this->clearPageCacheContent(); }
                                $this->pageNotFoundAndExit('Request parameters could not be validated (&cHash empty)');
                        } else {
-                               $this->set_no_cache();
+                               $this->disableCache();
                                $GLOBALS['TT']->setTSlogMessage('TSFE->reqCHash(): No &cHash parameter was sent for GET vars though required so caching is disabled',2);
                        }
                }