[TASK] Remove deprecated code 76/17676/5
authorBenjamin Mack <benni@typo3.org>
Sat, 9 Feb 2013 06:00:32 +0000 (07:00 +0100)
committerChristian Kuhn <lolli@schwarzbu.ch>
Thu, 21 Mar 2013 22:34:47 +0000 (23:34 +0100)
Remove deprecated code that is marked to be deleted in 6.1.

Change-Id: I4a8f512c039e537733228840f1fb8a592f8331a3
Resolves: #44763
Releases: 6.1
Reviewed-on: https://review.typo3.org/17676
Reviewed-by: Markus Klein
Tested-by: Markus Klein
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
t3lib/class.t3lib_userauthgroup.php
typo3/sysext/backend/Classes/Form/FormEngine.php
typo3/sysext/cms/tslib/index_ts.php
typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
typo3/sysext/core/Classes/Utility/GeneralUtility.php
typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php
typo3/sysext/extensionmanager/Classes/ViewHelpers/Form/TypoScriptConstantsViewHelper.php
typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
typo3/sysext/frontend/Classes/Page/CacheHashCalculator.php
typo3/sysext/indexed_search/Classes/Controller/IndexedPagesController.php
typo3/sysext/indexed_search/Classes/Indexer.php

index 83e62bb..1f501bb 100644 (file)
@@ -1019,20 +1019,6 @@ abstract class t3lib_userAuthGroup extends t3lib_userAuth {
        }
 
        /**
-        * Returns TRUE if $item is in $in_list
-        *
-        * @param string $in_list Comma list with items, no spaces between items!
-        * @param string $item The string to find in the list of items
-        * @return string Boolean
-        * @deprecated since TYPO3 4.7, should be removed in TYPO3 6.1, use equivalent function t3lib_div::inList()
-        * @todo Define visibility
-        */
-       public function inList($in_list, $item) {
-               t3lib_div::logDeprecatedFunction();
-               return t3lib_div::inList($in_list, $item);
-       }
-
-       /**
         * Returns an array with the webmounts.
         * If no webmounts, and empty array is returned.
         * NOTICE: Deleted pages WILL NOT be filtered out! So if a mounted page has been deleted it is STILL coming out as a webmount. This is not checked due to performance.
index 09c1cdb..9bcdcb0 100644 (file)
@@ -2781,11 +2781,7 @@ function ' . $evalData . '(value) {
                                        // for whatever reason,
                                        // now, only using <title> in an unnested way is fine.
                                        $theTitle = $value['title'];
-                                       // Old syntax is deprecated and will be removed in TYPO3 6.1
-                                       if (!$theTitle && isset($value['tx_templavoila']['title'])) {
-                                               \TYPO3\CMS\Core\Utility\GeneralUtility::deprecationLog('The flexform XML, used in ' . htmlspecialchars($table) . ':' . htmlspecialchars($field) . ' is using legacy syntax, the <title> is wrapped in <tx_templavoila>, however should be moved outside of that XML tag container. This functionality will be removed in TYPO3 6.1.');
-                                               $theTitle = $value['tx_templavoila']['title'];
-                                       }
+
                                        // If there is a title, check for LLL label
                                        if (strlen($theTitle) > 0) {
                                                $theTitle = htmlspecialchars(\TYPO3\CMS\Core\Utility\GeneralUtility::fixed_lgd_cs($this->sL($theTitle), 30));
index 2b4aa80..afe434b 100644 (file)
@@ -119,7 +119,8 @@ $TSFE->clear_preview();
 $TSFE->determineId();
 // Now, if there is a backend user logged in and he has NO access to this page, then re-evaluate the id shown!
 if ($TSFE->isBackendUserLoggedIn() && (!$BE_USER->extPageReadAccess($TSFE->page) || \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('ADMCMD_noBeUser'))) {
-       // \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('ADMCMD_noBeUser') is placed here because workspacePreviewInit() might need to know if a backend user is logged in!
+       // \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('ADMCMD_noBeUser') is placed here because
+       // Tx_Version_PreviewHook might need to know if a backend user is logged in!
        // Remove user
        unset($BE_USER);
        $TSFE->beUserLogin = 0;
index 7380558..2dbccc3 100644 (file)
@@ -1173,20 +1173,6 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
        }
 
        /**
-        * Returns TRUE if $item is in $in_list
-        *
-        * @param string $in_list Comma list with items, no spaces between items!
-        * @param string $item The string to find in the list of items
-        * @return string Boolean
-        * @deprecated since TYPO3 4.7, should be removed in TYPO3 6.1, use equivalent function \TYPO3\CMS\Core\Utility\GeneralUtility::inList()
-        * @todo Define visibility
-        */
-       public function inList($in_list, $item) {
-               \TYPO3\CMS\Core\Utility\GeneralUtility::logDeprecatedFunction();
-               return \TYPO3\CMS\Core\Utility\GeneralUtility::inList($in_list, $item);
-       }
-
-       /**
         * Returns an array with the webmounts.
         * If no webmounts, and empty array is returned.
         * NOTICE: Deleted pages WILL NOT be filtered out! So if a mounted page has been deleted it is STILL coming out as a webmount. This is not checked due to performance.
index e14e8a1..0ed1b0f 100644 (file)
@@ -723,21 +723,6 @@ class GeneralUtility {
        }
 
        /**
-        * Returns an integer from a three part version number, eg '4.12.3' -> 4012003
-        *
-        * @param string $verNumberStr Version number on format x.x.x
-        * @return integer Integer version of version number (where each part can count to 999)
-        * @deprecated since TYPO3 4.6, will be removed in TYPO3 6.1 - Use t3lib_utility_VersionNumber::convertVersionNumberToInteger() instead
-        */
-       static public function int_from_ver($verNumberStr) {
-               // Deprecation log is activated only for TYPO3 4.7 and above
-               if (\TYPO3\CMS\Core\Utility\VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version) >= 4007000) {
-                       self::logDeprecatedFunction();
-               }
-               return \TYPO3\CMS\Core\Utility\VersionNumberUtility::convertVersionNumberToInteger($verNumberStr);
-       }
-
-       /**
         * Returns TRUE if the current TYPO3 version (or compatibility version) is compatible to the input version
         * Notice that this function compares branches, not versions (4.0.1 would be > 4.0.0 although they use the same compat_version)
         *
@@ -3697,69 +3682,6 @@ Connection: close
        }
 
        /**
-        * Splits the input query-parameters into an array with certain parameters filtered out.
-        * Used to create the cHash value
-        *
-        * @param string $addQueryParams Query-parameters: "&xxx=yyy&zzz=uuu
-        * @return array Array with key/value pairs of query-parameters WITHOUT a certain list of variable names (like id, type, no_cache etc.) and WITH a variable, encryptionKey, specific for this server/installation
-        * @see tslib_fe::makeCacheHash(), tslib_cObj::typoLink(), \TYPO3\CMS\Core\Utility\GeneralUtility::calculateCHash()
-        * @deprecated since TYPO3 4.7 - will be removed in TYPO3 6.1 - use t3lib_cacheHash instead
-        */
-       static public function cHashParams($addQueryParams) {
-               self::logDeprecatedFunction();
-               // Splitting parameters up
-               $params = explode('&', substr($addQueryParams, 1));
-               /* @var $cacheHash t3lib_cacheHash */
-               $cacheHash = self::makeInstance('TYPO3\\CMS\\Frontend\\Page\\CacheHashCalculator');
-               $pA = $cacheHash->getRelevantParameters($addQueryParams);
-               // Hook: Allows to manipulate the parameters which are taken to build the chash:
-               if (isset($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_div.php']['cHashParamsHook'])) {
-                       $cHashParamsHook = &$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_div.php']['cHashParamsHook'];
-                       if (is_array($cHashParamsHook)) {
-                               $hookParameters = array(
-                                       'addQueryParams' => &$addQueryParams,
-                                       'params' => &$params,
-                                       'pA' => &$pA
-                               );
-                               $hookReference = NULL;
-                               foreach ($cHashParamsHook as $hookFunction) {
-                                       self::callUserFunction($hookFunction, $hookParameters, $hookReference);
-                               }
-                       }
-               }
-               return $pA;
-       }
-
-       /**
-        * Returns the cHash based on provided query parameters and added values from internal call
-        *
-        * @param string $addQueryParams Query-parameters: "&xxx=yyy&zzz=uuu
-        * @return string Hash of all the values
-        * @see \TYPO3\CMS\Core\Utility\GeneralUtility::cHashParams(), \TYPO3\CMS\Core\Utility\GeneralUtility::calculateCHash()
-        * @deprecated since TYPO3 4.7 - will be removed in TYPO3 6.1 - use t3lib_cacheHash instead
-        */
-       static public function generateCHash($addQueryParams) {
-               self::logDeprecatedFunction();
-               /* @var $cacheHash t3lib_cacheHash */
-               $cacheHash = self::makeInstance('TYPO3\\CMS\\Frontend\\Page\\CacheHashCalculator');
-               return $cacheHash->generateForParameters($addQueryParams);
-       }
-
-       /**
-        * Calculates the cHash based on the provided parameters
-        *
-        * @param array $params Array of key-value pairs
-        * @return string Hash of all the values
-        * @deprecated since TYPO3 4.7 - will be removed in TYPO3 6.1 - use t3lib_cacheHash instead
-        */
-       static public function calculateCHash($params) {
-               self::logDeprecatedFunction();
-               /* @var $cacheHash t3lib_cacheHash */
-               $cacheHash = self::makeInstance('TYPO3\\CMS\\Frontend\\Page\\CacheHashCalculator');
-               return $cacheHash->calculateCacheHash($params);
-       }
-
-       /**
         * Responds on input localization setting value whether the page it comes from should be hidden if no translation exists or not.
         *
         * @param integer $l18n_cfg_fieldValue Value from "l18n_cfg" field of a page record
index f7572f8..47a0128 100644 (file)
@@ -1324,32 +1324,6 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
        }
 
        //////////////////////////////////
-       // Tests concerning int_from_ver
-       //////////////////////////////////
-       /**
-        * Data Provider for intFromVerConvertsVersionNumbersToIntegersDataProvider
-        *
-        * return array
-        */
-       public function intFromVerConvertsVersionNumbersToIntegersDataProvider() {
-               return array(
-                       array('4003003', '4.3.3'),
-                       array('4012003', '4.12.3'),
-                       array('5000000', '5.0.0'),
-                       array('3008001', '3.8.1'),
-                       array('1012', '0.1.12')
-               );
-       }
-
-       /**
-        * @test
-        * @dataProvider intFromVerConvertsVersionNumbersToIntegersDataProvider
-        */
-       public function intFromVerConvertsVersionNumbersToIntegers($expected, $version) {
-               $this->assertEquals($expected, Utility\GeneralUtility::int_from_ver($version));
-       }
-
-       //////////////////////////////////
        // Tests concerning revExplode
        //////////////////////////////////
        /**
index 59fcab1..cac1752 100644 (file)
@@ -45,8 +45,6 @@ class TypoScriptConstantsViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\Abs
                'user' => 'renderUserFunction',
                'small' => 'renderSmallTextField',
                'string' => 'renderTextField',
-               'input' => 'renderTextField',   // only for backwards compatibility, will be removed with TYPO3 6.1
-               'default' => 'renderTextField'  // only for backwards compatibility, will be removed with TYPO3 6.1
        );
 
        public $tagName = 'input';
@@ -207,10 +205,6 @@ class TypoScriptConstantsViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\Abs
         * @return string
         */
        protected function renderTextField(\TYPO3\CMS\Extensionmanager\Domain\Model\ConfigurationItem $configuration) {
-               if ($configuration->getType() !== 'string') {
-                       \TYPO3\CMS\Core\Utility\GeneralUtility::deprecationLog('The type "' . $configuration->getType() .
-                               '" is deprecated and will be removed with TYPO3 6.1');
-               }
                $this->tag->setTagName('input');
                $this->tag->addAttribute('type', 'text');
                $this->tag->addAttribute('name', $this->getName($configuration));
index c31855b..737ecea 100644 (file)
@@ -2120,23 +2120,6 @@ class TypoScriptFrontendController {
        }
 
        /**
-        * Splits the input query-parameters into an array with certain parameters filtered out.
-        * Used to create the cHash value
-        *
-        * @param string $addQueryParams Query-parameters: "&xxx=yyy&zzz=uuu
-        * @return array Array with key/value pairs of query-parameters WITHOUT a certain list of variable names (like id, type, no_cache etc) and WITH a variable, encryptionKey, specific for this server/installation
-        * @access private
-        * @see makeCacheHash(), tslib_cObj::typoLink()
-        * @deprecated since TYPO3 4.7 - will be removed in TYPO3 6.1 - use t3lib_cacheHash instead
-        * @obsolete
-        * @todo Define visibility
-        */
-       public function cHashParams($addQueryParams) {
-               \TYPO3\CMS\Core\Utility\GeneralUtility::logDeprecatedFunction();
-               return $this->cacheHash->calculateCacheHash($addQueryParams);
-       }
-
-       /**
         * Initialize the TypoScript template parser
         *
         * @return void
@@ -4194,25 +4177,6 @@ if (version == "n3") {
        /********************************************
         * PUBLIC ACCESSIBLE WORKSPACES FUNCTIONS
         *******************************************/
-       /**
-        * Initialize workspace preview
-        *
-        * @return void
-        * @deprecated since TYPO3 4.7, will be removed in TYPO3 6.1 as this is part of Tx_Version now
-        */
-       public function workspacePreviewInit() {
-               \TYPO3\CMS\Core\Utility\GeneralUtility::logDeprecatedFunction();
-               $previewWS = \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('ADMCMD_previewWS');
-               if ($this->beUserLogin && is_object($GLOBALS['BE_USER']) && \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($previewWS)) {
-                       if ($previewWS == 0 || $previewWS >= -1 && $GLOBALS['BE_USER']->checkWorkspace($previewWS)) {
-                               // Check Access to workspace. Live (0) is OK to preview for all.
-                               $this->workspacePreview = intval($previewWS);
-                       } else {
-                               // No preview, will default to "Live" at the moment
-                               $this->workspacePreview = -99;
-                       }
-               }
-       }
 
        /**
         * Returns TRUE if workspace preview is enabled
index 834300a..b3fd89b 100644 (file)
@@ -81,7 +81,6 @@ class CacheHashCalculator implements \TYPO3\CMS\Core\SingletonInterface {
         *
         * @param string $queryString Query-parameters: "&xxx=yyy&zzz=uuu
         * @return string Hash of all the values
-        * @see \TYPO3\CMS\Core\Utility\GeneralUtility::cHashParams(), \TYPO3\CMS\Core\Utility\GeneralUtility::calculateCHash()
         */
        public function generateForParameters($queryString) {
                $cacheHashParams = $this->getRelevantParameters($queryString);
@@ -114,7 +113,7 @@ class CacheHashCalculator implements \TYPO3\CMS\Core\SingletonInterface {
         *
         * @param string $queryString Query-parameters: "&xxx=yyy&zzz=uuu
         * @return array Array with key/value pairs of query-parameters WITHOUT a certain list of
-        * @see tslib_fe::makeCacheHash(), tslib_cObj::typoLink(), \TYPO3\CMS\Core\Utility\GeneralUtility::calculateCHash()
+        * @see tslib_fe::makeCacheHash(), tslib_cObj::typoLink()
         */
        public function getRelevantParameters($queryString) {
                $parameters = $this->splitQueryStringToArray($queryString);
index 1d01ad2..b2cd92f 100644 (file)
@@ -302,7 +302,7 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
                } else {
                        $page = '';
                }
-               $elTitle = $this->linkDetails($row['item_title'] ? htmlspecialchars(\TYPO3\CMS\Core\Utility\GeneralUtility::fixed_lgd_cs($this->utf8_to_currentCharset($row['item_title']), 20) . $page) : '<em>[No Title]</em>', $row['phash']);
+               $elTitle = $this->linkDetails($row['item_title'] ? htmlspecialchars(\TYPO3\CMS\Core\Utility\GeneralUtility::fixed_lgd_cs($row['item_title'], 20) . $page) : '<em>[No Title]</em>', $row['phash']);
                $cmdLinks = $this->printRemoveIndexed($row['phash'], 'Clear phash-row') . $this->printReindex($row, 'Re-index element');
                switch ($this->pObj->MOD_SETTINGS['type']) {
                case 1:
@@ -367,14 +367,14 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
                        $lines[] = '<td>' . $cmdLinks . '</td>';
                        // Query:
                        $ftrow = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow('*', 'index_fulltext', 'phash = ' . intval($row['phash']));
-                       $lines[] = '<td style="white-space: normal;">' . htmlspecialchars(\TYPO3\CMS\Core\Utility\GeneralUtility::fixed_lgd_cs($this->utf8_to_currentCharset($ftrow['fulltextdata']), 3000)) . '<hr/><em>Size: ' . strlen($ftrow['fulltextdata']) . '</em>' . '</td>';
+                       $lines[] = '<td style="white-space: normal;">' . htmlspecialchars(\TYPO3\CMS\Core\Utility\GeneralUtility::fixed_lgd_cs($ftrow['fulltextdata'], 3000)) . '<hr/><em>Size: ' . strlen($ftrow['fulltextdata']) . '</em>' . '</td>';
                        // Query:
                        $ftrows = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('index_words.baseword, index_rel.*', 'index_rel, index_words', 'index_rel.phash = ' . intval($row['phash']) . ' AND index_words.wid = index_rel.wid', '', '', '', 'baseword');
                        $wordList = '';
                        if (is_array($ftrows)) {
                                $indexed_words = array_keys($ftrows);
                                sort($indexed_words);
-                               $wordList = htmlspecialchars($this->utf8_to_currentCharset(implode(' ', $indexed_words)));
+                               $wordList = htmlspecialchars(implode(' ', $indexed_words));
                                $wordList .= '<hr/><em>Count: ' . count($indexed_words) . '</em>';
                        }
                        $lines[] = '<td style="white-space: normal;">' . $wordList . '</td>';
@@ -391,7 +391,7 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
                        $lines[] = '<td' . $titleCellAttribs . '>' . $elTitle . '</td>';
                        // Remove-indexing-link:
                        $lines[] = '<td>' . $cmdLinks . '</td>';
-                       $lines[] = '<td style="white-space: normal;">' . htmlspecialchars($this->utf8_to_currentCharset($row['item_description'])) . '...</td>';
+                       $lines[] = '<td style="white-space: normal;">' . htmlspecialchars($row['item_description']) . '...</td>';
                        $lines[] = '<td>' . \TYPO3\CMS\Core\Utility\GeneralUtility::formatSize($row['item_size']) . '</td>';
                        $lines[] = '<td>' . \TYPO3\CMS\Backend\Utility\BackendUtility::dateTimeAge($row['tstamp']) . '</td>';
                        break;
@@ -490,15 +490,15 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
                $phashRecord = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow('*', 'index_phash', 'phash = ' . intval($phash));
                // If found, display:
                if (is_array($phashRecord)) {
-                       $content .= '<h4>phash row content:</h4>' . $this->utf8_to_currentCharset(\TYPO3\CMS\Core\Utility\DebugUtility::viewArray($phashRecord));
+                       $content .= '<h4>phash row content:</h4>' . \TYPO3\CMS\Core\Utility\DebugUtility::viewArray($phashRecord);
                        // Getting debug information if any:
                        $ftrows = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*', 'index_debug', 'phash = ' . intval($phash));
                        if (is_array($ftrows)) {
                                $debugInfo = unserialize($ftrows[0]['debuginfo']);
                                $lexer = $debugInfo['lexer'];
                                unset($debugInfo['lexer']);
-                               $content .= '<h3>Debug information:</h3>' . $this->utf8_to_currentCharset(\TYPO3\CMS\Core\Utility\DebugUtility::viewArray($debugInfo));
-                               $content .= '<h4>Debug information / lexer splitting:</h4>' . '<hr/><strong>' . $this->utf8_to_currentCharset($lexer) . '</strong><hr/>';
+                               $content .= '<h3>Debug information:</h3>' . \TYPO3\CMS\Core\Utility\DebugUtility::viewArray($debugInfo);
+                               $content .= '<h4>Debug information / lexer splitting:</h4>' . '<hr/><strong>' . $lexer . '</strong><hr/>';
                        }
                        $content .= '<h3>Word statistics</h3>';
                        // Finding all words for this phash:
@@ -565,7 +565,7 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
                        $trows .= '
                                <tr class="' . ($row['is_stopword'] ? 'bgColor' : 'bgColor4') . '">
                                        ' . ($stopWordBoxes ? '<td align="center"' . ($row['is_stopword'] ? ' style="background-color:red;"' : '') . '>' . $hiddenField . '<input type="checkbox" name="stopWord[' . $row['wid'] . ']" value="1"' . ($row['is_stopword'] ? 'checked="checked"' : '') . ' /></td>' : '') . '
-                                       <td>' . $this->linkWordDetails(htmlspecialchars($this->utf8_to_currentCharset($row['baseword'])), $row['wid']) . '</td>
+                                       <td>' . $this->linkWordDetails(htmlspecialchars($row['baseword']), $row['wid']) . '</td>
                                        <td>' . htmlspecialchars($row['count']) . '</td>
                                        <td>' . htmlspecialchars($row['first']) . '</td>
                                        <td>' . htmlspecialchars($row['freq']) . '</td>
@@ -605,7 +605,7 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
                                                <td>' . $this->linkMetaPhoneDetails($this->indexerObj->metaphone($words[0], 1), $metaphone) . '</td>
                                                <td>' . htmlspecialchars($metaphone) . '</td>
                                                <td>' . htmlspecialchars(count($words)) . '</td>
-                                               <td style="white-space: normal;">' . htmlspecialchars($this->utf8_to_currentCharset(implode(', ', $words))) . '</td>
+                                               <td style="white-space: normal;">' . htmlspecialchars(implode(', ', $words)) . '</td>
                                        </tr>
                                ';
                        }
@@ -877,19 +877,6 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
                return str_replace('###TITLE_ATTRIBUTE###', htmlspecialchars($it . ': ' . $alt), $this->iconFileNameCache[$it]);
        }
 
-       /**
-        * Converts the input string from utf-8 to the backend charset.
-        *
-        * @param       string          String to convert (utf-8)
-        * @return      string          Converted string (backend charset if different from utf-8)
-        * @deprecated since 4.7, will be removed in 6.1
-        * @todo Define visibility
-        */
-       public function utf8_to_currentCharset($string) {
-               \TYPO3\CMS\Core\Utility\GeneralUtility::logDeprecatedFunction();
-               return $string;
-       }
-
        /********************************
         *
         * Reindexing
index 5b74da3..0e5281f 100644 (file)
@@ -353,7 +353,13 @@ class Indexer {
                $this->conf['gr_list'] = '0,-1';
                // Group list (hardcoded for now...)
                // cHash values:
-               $this->conf['cHash'] = $createCHash ? \TYPO3\CMS\Core\Utility\GeneralUtility::generateCHash(\TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl('', $cHash_array)) : '';
+               if ($createCHash) {
+                       /* @var $cacheHash \TYPO3\CMS\Frontend\Page\CacheHashCalculator */
+                       $cacheHash = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Frontend\\Page\\CacheHashCalculator');
+                       $this->conf['cHash'] = $cacheHash->generateForParameters(\TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl('', $cHash_array));
+               } else {
+                       $this->conf['cHash'] = '';
+               }
                // cHash string for additional parameters
                $this->conf['cHash_array'] = $cHash_array;
                // Array of the additional parameters