Bug #24545 » 17001_v1.diff
| typo3/sysext/cms/tslib/class.tslib_menu.php (working copy) | ||
|---|---|---|
|
case 'xhtml_strict':
|
||
|
case 'xhtml_11':
|
||
|
case 'xhtml_2':
|
||
|
case 'html_5':
|
||
|
case 'html5':
|
||
|
$this->nameAttribute = 'id';
|
||
|
break;
|
||
|
default:
|
||
| typo3/sysext/cms/tslib/class.tslib_pagegen.php (working copy) | ||
|---|---|---|
|
}
|
||
|
// Setting XHTML-doctype from doctype
|
||
|
if (!$GLOBALS['TSFE']->config['config']['xhtmlDoctype']) {
|
||
|
if (!$GLOBALS['TSFE']->config['config']['xhtmlDoctype']) {
|
||
|
$GLOBALS['TSFE']->config['config']['xhtmlDoctype'] = $GLOBALS['TSFE']->config['config']['doctype'];
|
||
|
}
|
||
|
|
||
|
if($GLOBALS['TSFE']->config['config']['xhtmlDoctype'] == 'html_5') {
|
||
|
t3lib_div::deprecationLog('config.doctype = html_5 is deprecated. Use config.doctype = html5 instead.');
|
||
|
$GLOBALS['TSFE']->config['config']['xhtmlDoctype'] = 'html5';
|
||
|
}
|
||
|
if ($GLOBALS['TSFE']->config['config']['xhtmlDoctype']) {
|
||
|
$GLOBALS['TSFE']->xhtmlDoctype = $GLOBALS['TSFE']->config['config']['xhtmlDoctype'];
|
||
| ... | ... | |
|
if ($GLOBALS['TSFE']->xhtmlVersion) {
|
||
|
$htmlTagAttributes['xml:lang'] = $htmlLang;
|
||
|
}
|
||
|
if ($GLOBALS['TSFE']->xhtmlVersion < 110 || $doctype === 'html_5') {
|
||
|
if ($GLOBALS['TSFE']->xhtmlVersion < 110 || $doctype === 'html5') {
|
||
|
$htmlTagAttributes['lang'] = $htmlLang;
|
||
|
}
|
||
|
if ($GLOBALS['TSFE']->xhtmlVersion || $doctype === 'html_5') {
|
||
|
if ($GLOBALS['TSFE']->xhtmlVersion || $doctype === 'html5') {
|
||
|
$htmlTagAttributes['xmlns'] = 'http://www.w3.org/1999/xhtml'; // We add this to HTML5 to achieve a slightly better backwards compatibility
|
||
|
if (is_array($GLOBALS['TSFE']->config['config']['namespaces.'])) {
|
||
|
foreach ($GLOBALS['TSFE']->config['config']['namespaces.'] as $prefix => $uri) {
|
||
| typo3/sysext/t3editor/res/tsref/tsref.xml (working copy) | ||
|---|---|---|
|
"xhtml_11" for XHTML 1.1 doctype.
|
||
|
"xhtml+rdf_10" for XHTML+RDFa 1.0 doctype.
|
||
|
"xhtml_2" for XHTML 2 doctype.
|
||
|
"html_5" for HTML5
|
||
|
"html5" for HTML5
|
||
|
"none" for NO doctype at all.
|
||
|
Note that the keywords also change the way TYPO3 generates some of the XHTML tags to ensure valid XML. If you set doctype to a string, then you must also set config.xhtmlDoctype (see below).
|
||
| typo3/template.php (working copy) | ||
|---|---|---|
|
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
|
||
|
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">';
|
||
|
// The fallthrough is intended as HTML5, as this is the default for the BE since TYPO3 4.5
|
||
|
case 'html_5':
|
||
|
case 'html5':
|
||
|
default:
|
||
|
$headerStart = '<!DOCTYPE html>' . LF;
|
||
|
$htmlTag = '<html>';
|
||