tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

MINOR: if no doctyle is set, include comments inside <html>

Browse Source 
MINOR: if <html> tag is inside a html comment do not add a comment
This commit is contained in:
Zauberfisch 2013-04-22 18:16:09 +00:00
parent 94b37f9c85
commit 034f575003
2 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
view/SSTemplateParser.php
View File

@ -4608,13 +4608,27 @@ class SSTemplateParser extends Parser {
// if not, put it after the <html> tag to avoid IE glitches
if(stripos($code, "<!doctype") !== false) {
$code = preg_replace('/(<!doctype[^>]*("[^"]")*[^>]*>)/im', "$1\r\n<!-- template $templateName -->", $code);
$code .= "\r\n" . '$val .= \'<!-- end template ' . $templateName . ' -->\';';
} elseif(stripos($code, "<html") !== false) {
$code = preg_replace('/(<html[^>]*>)/i', "$1<!-- template $templateName -->", $code);
$code = preg_replace_callback('/(.*)(<html[^>]*>)(.*)/i', function($matches) use ($templateName) {
if (stripos($matches[3], '<!--') === false && stripos($matches[3], '-->') !== false) {
// after this <html> tag there is a comment close but no comment has been opened
// this most likely means that this <html> tag is inside a comment
// we should not add a comment inside a comment (invalid html)
// lets append it at the end of the comment
// an example case for this is the html5boilerplate: <!--[if IE]><html class="ie"><![endif]-->
return $matches[0];
} else {
// all other cases, add the comment and return it
return "{$matches[1]}{$matches[2]}<!-- template $templateName -->{$matches[3]}";
}
}, $code);
$code = preg_replace('/(<\/html[^>]*>)/i', "<!-- end template $templateName -->$1", $code);
} else {
$code = str_replace('<?php' . PHP_EOL, '<?php' . PHP_EOL . '$val .= \'<!-- template ' . $templateName .
' -->\';' . "\r\n", $code);
$code .= "\r\n" . '$val .= \'<!-- end template ' . $templateName . ' -->\';';
}
$code .= "\r\n" . '$val .= \'<!-- end template ' . $templateName . ' -->\';';
return $code;
}

18
view/SSTemplateParser.php.inc
View File

@ -1062,13 +1062,27 @@ class SSTemplateParser extends Parser {
// if not, put it after the <html> tag to avoid IE glitches
if(stripos($code, "<!doctype") !== false) {
$code = preg_replace('/(<!doctype[^>]*("[^"]")*[^>]*>)/im', "$1\r\n<!-- template $templateName -->", $code);
$code .= "\r\n" . '$val .= \'<!-- end template ' . $templateName . ' -->\';';
} elseif(stripos($code, "<html") !== false) {
$code = preg_replace('/(<html[^>]*>)/i', "$1<!-- template $templateName -->", $code);
$code = preg_replace_callback('/(.*)(<html[^>]*>)(.*)/i', function($matches) use ($templateName) {
if (stripos($matches[3], '<!--') === false && stripos($matches[3], '-->') !== false) {
// after this <html> tag there is a comment close but no comment has been opened
// this most likely means that this <html> tag is inside a comment
// we should not add a comment inside a comment (invalid html)
// lets append it at the end of the comment
// an example case for this is the html5boilerplate: <!--[if IE]><html class="ie"><![endif]-->
return $matches[0];
} else {
// all other cases, add the comment and return it
return "{$matches[1]}{$matches[2]}<!-- template $templateName -->{$matches[3]}";
}
}, $code);
$code = preg_replace('/(<\/html[^>]*>)/i', "<!-- end template $templateName -->$1", $code);
} else {
$code = str_replace('<?php' . PHP_EOL, '<?php' . PHP_EOL . '$val .= \'<!-- template ' . $templateName .
' -->\';' . "\r\n", $code);
$code .= "\r\n" . '$val .= \'<!-- end template ' . $templateName . ' -->\';';
}
$code .= "\r\n" . '$val .= \'<!-- end template ' . $templateName . ' -->\';';
return $code;
}