[TASK] Cleanup pageRenderer USER_INT handling
authorHelmut Hummel <helmut.hummel@typo3.org>
Sun, 19 Aug 2012 09:06:31 +0000 (11:06 +0200)
committerHelmut Hummel <helmut.hummel@typo3.org>
Sun, 19 Aug 2012 09:07:57 +0000 (11:07 +0200)
Change-Id: Ib02fffa1d02553d84d2f6e8fcad78b3eeea2836b
Resolves: #39950
Relates: #22273
Releases: 6.0
Reviewed-on: http://review.typo3.org/13907
Reviewed-by: Helmut Hummel
Tested-by: Helmut Hummel
typo3/sysext/cms/tslib/class.tslib_fe.php

index 912a0cb..1e2764c 100644 (file)
@@ -3119,9 +3119,9 @@ class tslib_fe {
                $this->divSection='';
 
                if (!empty($this->config['INTincScript_ext']['pageRenderer'])) {
-                       /** @var $pageRenderer t3lib_PageRenderer */
-                       $pageRenderer = unserialize($this->config['INTincScript_ext']['pageRenderer']);
-                       $this->setPageRenderer($pageRenderer);
+                       $this->setPageRenderer(
+                               unserialize($this->config['INTincScript_ext']['pageRenderer'])
+                       );
                }
 
                do {
@@ -3139,9 +3139,7 @@ class tslib_fe {
                $this->content = str_replace('<!--FD_'.$this->config['INTincScript_ext']['divKey'].'-->', $this->convOutputCharset(implode(LF, $this->additionalFooterData), 'FD'), $this->content);
                $this->content = str_replace('<!--TDS_'.$this->config['INTincScript_ext']['divKey'].'-->', $this->convOutputCharset($this->divSection, 'TDS'), $this->content);
 
-               if (isset($pageRenderer)) {
-                       $this->content = $pageRenderer->renderJavaScriptAndCssForProcessingOfUncachedContentObjects($this->content, $this->config['INTincScript_ext']['divKey']);
-               }
+               $this->content = $this->pageRenderer->renderJavaScriptAndCssForProcessingOfUncachedContentObjects($this->content, $this->config['INTincScript_ext']['divKey']);
 
                $this->setAbsRefPrefix();
                $GLOBALS['TT']->pull();