[TASK] Remove old default constants from TS service 03/31803/2
authorChristian Kuhn <lolli@schwarzbu.ch>
Fri, 25 Jul 2014 11:36:50 +0000 (13:36 +0200)
committerBenjamin Mack <benni@typo3.org>
Fri, 25 Jul 2014 12:46:44 +0000 (14:46 +0200)
$this->const in TemplateService and an extending class is super old,
unused and removed.

Resolves: #60561
Releases: 6.3
Change-Id: Ief7382b11d94094be587ae691ee6e3d1812b2d91
Reviewed-on: http://review.typo3.org/31803
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Benjamin Mack <benni@typo3.org>
Tested-by: Benjamin Mack <benni@typo3.org>
typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
typo3/sysext/core/Classes/TypoScript/TemplateService.php

index 0a79876..0d0b27f 100644 (file)
@@ -300,7 +300,7 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
        }
 
        /**
-        * Parses the constants in $this->const with respect to the constant-editor in this module.
+        * Parse constants with respect to the constant-editor in this module.
         * In particular comments in the code are registered and the edit_divider is taken into account.
         *
         * @return      [type]          ...
@@ -314,8 +314,7 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
                $constants = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\TypoScript\\Parser\\TypoScriptParser');
                // Register comments!
                $constants->regComments = 1;
-               $constants->setup = $this->const;
-               $constants->setup = $this->mergeConstantsFromPageTSconfig($constants->setup);
+               $constants->setup = $this->mergeConstantsFromPageTSconfig(array());
                /** @var $matchObj \TYPO3\CMS\Frontend\Configuration\TypoScript\ConditionMatching\ConditionMatcher */
                $matchObj = GeneralUtility::makeInstance('TYPO3\\CMS\\Frontend\\Configuration\\TypoScript\\ConditionMatching\\ConditionMatcher');
                // Matches ALL conditions in TypoScript
index 5f3d2f2..76bacbc 100644 (file)
@@ -147,19 +147,6 @@ class TemplateService {
         */
        public $flatSetup = array();
 
-       // Default TypoScript Constants code:
-       /**
-        * @todo Define visibility
-        */
-       public $const = array(
-               '_clear' => '<img src="clear.gif" width="1" height="1" alt="" />',
-               '_blackBorderWrap' => '<table border="0" bgcolor="black" cellspacing="0" cellpadding="1"><tr><td> | </td></tr></table>',
-               '_tableWrap' => '<table border="0" cellspacing="0" cellpadding="0"> | </table>',
-               '_tableWrap_DEBUG' => '<table border="1" cellspacing="0" cellpadding="0"> | </table>',
-               '_stdFrameParams' => 'frameborder="no" marginheight="0" marginwidth="0" noresize="noresize"',
-               '_stdFramesetParams' => 'border="0" framespacing="0" frameborder="no"'
-       );
-
        // For fetching TypoScript code from template hierarchy before parsing it. Each array contains code field values from template records/files:
        // Setup field
        /**
@@ -935,8 +922,7 @@ class TemplateService {
                /** @var $constants \TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser */
                $constants = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\TypoScript\\Parser\\TypoScriptParser');
                $constants->breakPointLN = (int)$this->ext_constants_BRP;
-               $constants->setup = $this->const;
-               $constants->setup = $this->mergeConstantsFromPageTSconfig($constants->setup);
+               $constants->setup = $this->mergeConstantsFromPageTSconfig(array());
                /** @var $matchObj \TYPO3\CMS\Frontend\Configuration\TypoScript\ConditionMatching\ConditionMatcher */
                $matchObj = GeneralUtility::makeInstance('TYPO3\\CMS\\Frontend\\Configuration\\TypoScript\\ConditionMatching\\ConditionMatcher');
                $matchObj->setSimulateMatchConditions($this->matchAlternative);