Index: typo3/template.php
===================================================================
--- typo3/template.php (Revision 7728)
+++ typo3/template.php (Arbeitskopie)
@@ -195,6 +195,12 @@
var $backGroundImage = ''; // Background image of page (relative to PATH_typo3)
var $inDocStyles_TBEstyle = ''; // Inline css styling set from TBE_STYLES array
+ /**
+ * Whether to use the X-UA-Compatible meta tag
+ * @var boolean
+ */
+ protected $useCompatibilityTag = TRUE;
+
// Skinning
// stylesheets from core
protected $stylesheetsCore = array(
@@ -630,6 +636,15 @@
}
}
+ /**
+ * Defines whether to use the X-UA-Compatible meta tag.
+ *
+ * @param boolean $useCompatibilityTag Whether to use the tag
+ * @return void
+ */
+ public function useCompatibilityTag($useCompatibilityTag = TRUE) {
+ $this->useCompatibilityTag = (bool) $useCompatibilityTag;
+ }
@@ -641,6 +656,7 @@
+
/*****************************************
*
* PAGE BUILDING FUNCTIONS.
@@ -687,7 +703,7 @@
header ('Content-Type:text/html;charset='.$this->charset);
// Standard HTML tag
- $this->pageRenderer->setHtmlTag('');
+ $htmlTag = '';
switch($this->docType) {
case 'html_3':
@@ -703,10 +719,16 @@
break;
case 'xhtml_frames':
$headerStart = '';
+ PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">';
break;
- // The fallthrough is intended as XHTML 1.0 transitional is the default for the BE.
+ case 'html_5':
+ $headerStart = '' . LF;
+ $htmlTag = '';
+ // disable rendering of XHTML tags
+ $this->getPageRenderer()->setRenderXhtml(FALSE);
+ break;
+ // The fallthrough is intended as XHTML 1.0 transitional is the default for the BE.
case 'xhtml_trans':
default:
$headerStart = '';
}
+ $this->pageRenderer->setHtmlTag($htmlTag);
+
// This loads the tabulator-in-textarea feature. It automatically modifies
// every textarea which is found.
if (!$GLOBALS['BE_USER']->uc['disableTabInTextarea']) {
@@ -730,7 +754,7 @@
$xmlStylesheet = '';
// Add the XML prologue for XHTML doctypes
- if ($this->docType !== 'html_3') {
+ if ($this->docType !== 'html_3' && $this->docType !== 'html_5') {
// Put the XML prologue before or after the doctype declaration according to browser
if ($browserInfo['browser'] === 'msie' && $browserInfo['version'] < 7) {
$headerStart = $headerStart . LF . $xmlPrologue;
@@ -748,7 +772,9 @@
$this->pageRenderer->setHeadTag('' . LF. '');
$this->pageRenderer->setCharSet($this->charset);
$this->pageRenderer->addMetaTag($this->generator());
- $this->pageRenderer->addMetaTag($this->xUaCompatible());
+ if ($this->useCompatibilityTag) {
+ $this->pageRenderer->addMetaTag($this->xUaCompatible());
+ }
$this->pageRenderer->setTitle($title);
// add docstyles
@@ -813,7 +839,7 @@
header('Content-Encoding: None');
}
- if ($this->docType!='xhtml_frames') {
+ if ($this->docType !== 'xhtml_frames') {
$str .= ($this->divClass?'
@@ -1169,12 +1195,11 @@
/**
* Returns X-UA-Compatible meta tag
*
+ * @param string $content Content of the compatible tag (default: IE-8)
* @return string
*/
- function xUaCompatible() {
- // the most recent version if Internet Explorer, in which the Backend works
- $str = "IE=8";
- return '';
+ public function xUaCompatible($content = 'IE=8') {
+ return '';
}
Index: typo3/sysext/cms/tslib/class.tslib_pagegen.php
===================================================================
--- typo3/sysext/cms/tslib/class.tslib_pagegen.php (Revision 7728)
+++ typo3/sysext/cms/tslib/class.tslib_pagegen.php (Arbeitskopie)
@@ -428,6 +428,9 @@
PUBLIC "-//W3C//DTD XHTML 2.0//EN"
"http://www.w3.org/TR/xhtml2/DTD/xhtml2.dtd">';
break;
+ case 'html_5' :
+ $docTypeParts[] = '';
+ break;
case 'none' :
break;
default :
@@ -1177,4 +1180,4 @@
var $fromTC = 0; // Means that everything is returned instead of only uid and label-field
}
-?>
+?>
\ No newline at end of file