Project

General

Profile

Download (5.59 KB)

Bug #54467 » 0001-BUGFIX-title.patch

Patch should make changes to TSFE->altPageTitle working again in *_INT - Markus Klein, 2014-01-13 14:54

View differences:

typo3/sysext/core/Classes/Page/PageRenderer.php
public function renderJavaScriptAndCssForProcessingOfUncachedContentObjects($cachedPageContent, $substituteHash) {
$this->prepareRendering();
list($jsLibs, $jsFiles, $jsFooterFiles, $cssFiles, $jsInline, $cssInline, $jsFooterInline, $jsFooterLibs) = $this->renderJavaScriptAndCss();
$title = $this->title ? str_replace('|', htmlspecialchars($this->title), $this->titleTag) : '';
$markerArray = array(
'<!-- ###TITLE' . $substituteHash . '### -->' => $title,
'<!-- ###CSS_INCLUDE' . $substituteHash . '### -->' => $cssFiles,
'<!-- ###CSS_INLINE' . $substituteHash . '### -->' => $cssInline,
'<!-- ###JS_INLINE' . $substituteHash . '### -->' => $jsInline,
......
'INLINECOMMENT' => $this->inlineComments ? LF . LF . '<!-- ' . LF . implode(LF, $this->inlineComments) . '-->' . LF . LF : '',
'BASEURL' => $this->baseUrl ? str_replace('|', $this->baseUrl, $this->baseUrlTag) : '',
'SHORTCUT' => $this->favIcon ? sprintf($this->shortcutTag, htmlspecialchars($this->favIcon), $this->iconMimeType) : '',
'TITLE' => $this->title ? str_replace('|', htmlspecialchars($this->title), $this->titleTag) : '',
'META' => implode(LF, $this->metaTags),
'BODY' => $this->bodyContent,
'TITLE' => '<!-- ###TITLE' . $substituteHash . '### -->',
'CSS_INCLUDE' => '<!-- ###CSS_INCLUDE' . $substituteHash . '### -->',
'CSS_INLINE' => '<!-- ###CSS_INLINE' . $substituteHash . '### -->',
'JS_INLINE' => '<!-- ###JS_INLINE' . $substituteHash . '### -->',
typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
$this->recursivelyReplaceIntPlaceholdersInContent();
$GLOBALS['TT']->push('Substitute header section');
$this->INTincScript_loadJSCode();
\TYPO3\CMS\Frontend\Page\PageGenerator::generatePageTitle();
$this->content = str_replace(
array(
'<!--HD_' . $this->config['INTincScript_ext']['divKey'] . '-->',
typo3/sysext/frontend/Classes/Page/PageGenerator.php
if (is_array($GLOBALS['TSFE']->pSetup['footerData.'])) {
$pageRenderer->addFooterData($GLOBALS['TSFE']->cObj->cObjGet($GLOBALS['TSFE']->pSetup['footerData.'], 'footerData.'));
}
// Title
$titleTagContent = $GLOBALS['TSFE']->tmpl->printTitle($GLOBALS['TSFE']->altPageTitle ? $GLOBALS['TSFE']->altPageTitle : $GLOBALS['TSFE']->page['title'], $GLOBALS['TSFE']->config['config']['noPageTitle'], $GLOBALS['TSFE']->config['config']['pageTitleFirst']);
if ($GLOBALS['TSFE']->config['config']['titleTagFunction']) {
$titleTagContent = $GLOBALS['TSFE']->cObj->callUserFunction($GLOBALS['TSFE']->config['config']['titleTagFunction'], array(), $titleTagContent);
}
if (strlen($titleTagContent) && intval($GLOBALS['TSFE']->config['config']['noPageTitle']) !== 2) {
$pageRenderer->setTitle($titleTagContent);
}
static::generatePageTitle();
// Add ending slash only to documents rendered as xhtml
$endingSlash = $GLOBALS['TSFE']->xhtmlVersion ? ' /' : '';
$pageRenderer->addMetaTag('<meta name="generator" content="TYPO3 ' . TYPO3_branch . ' CMS"' . $endingSlash . '>');
......
return $OK;
}
/**
* Generate title for page.
* Takes the settings ['config']['noPageTitle'], ['config']['pageTitleFirst'], ['config']['titleTagFunction']
* and ['config']['noPageTitle'] into account.
* Furthermore $GLOBALS['TSFE']->altPageTitle is observed.
*
* @return void
*/
static public function generatePageTitle() {
$titleTagContent = $GLOBALS['TSFE']->tmpl->printTitle(
$GLOBALS['TSFE']->altPageTitle ? $GLOBALS['TSFE']->altPageTitle : $GLOBALS['TSFE']->page['title'],
$GLOBALS['TSFE']->config['config']['noPageTitle'],
$GLOBALS['TSFE']->config['config']['pageTitleFirst']
);
if ($GLOBALS['TSFE']->config['config']['titleTagFunction']) {
$titleTagContent = $GLOBALS['TSFE']->cObj->callUserFunction(
$GLOBALS['TSFE']->config['config']['titleTagFunction'],
array(),
$titleTagContent
);
}
if ($titleTagContent !== '' && (integer)$GLOBALS['TSFE']->config['config']['noPageTitle'] !== 2) {
$GLOBALS['TSFE']->getPageRenderer()->setTitle($titleTagContent);
}
}
}
(5-5/5)