[BUGFIX] Do not unset() PageRenderer class members 69/29469/2
authorMarkus Klein <klein.t3@mfc-linz.at>
Mon, 14 Apr 2014 23:49:50 +0000 (01:49 +0200)
committerStefan Neufeind <typo3.neufeind@speedpartner.de>
Mon, 14 Apr 2014 23:53:15 +0000 (01:53 +0200)
Instead reset them to a default value.

Resolves: #57920
Releases: 6.2
Change-Id: I900cbd46b5573a84133efe1cf9fbf29d483e8096
Reviewed-on: https://review.typo3.org/29469
Reviewed-by: Stefan Neufeind
Tested-by: Stefan Neufeind
typo3/sysext/core/Classes/Page/PageRenderer.php

index 5a1d299..c157242 100644 (file)
@@ -2238,7 +2238,7 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface {
                                $this->includeLanguageFileForInline($languageLabelFile['fileRef'], $languageLabelFile['selectionPrefix'], $languageLabelFile['stripFromSelectionName'], $languageLabelFile['$errorMode']);
                        }
                }
-               unset($this->inlineLanguageLabelFiles);
+               $this->inlineLanguageLabelFiles = array();
                // Convert labels/settings back to UTF-8 since json_encode() only works with UTF-8:
                if ($this->getCharSet() !== 'utf-8') {
                        if ($this->inlineLanguageLabels) {
@@ -2270,7 +2270,7 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface {
                                        . $code
                                . ' });'
                                . $this->inlineJavascriptWrap[1];
-                       unset($this->extOnReadyCode);
+                       $this->extOnReadyCode = array();
                        // Include TYPO3.l10n object
                        if (TYPO3_MODE === 'BE') {
                                $out .= '<script src="' . $this->processJsFile(($this->backPath . 'sysext/lang/Resources/Public/JavaScript/Typo3Lang.js')) . '" type="text/javascript" charset="utf-8"></script>' . LF;