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

BUGFIX: Removed XHTML XML declaration requirement

Browse Source
This commit is contained in:
g4b0 2013-03-07 11:35:24 +01:00
parent d57caa6477
commit 13b7386a2f
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
control/ContentNegotiator.php
View File

@ -134,25 +134,19 @@ class ContentNegotiator {
*/ */
public function xhtml(SS_HTTPResponse $response) { public function xhtml(SS_HTTPResponse $response) {
$content = $response->getBody(); $content = $response->getBody();
// Only serve "pure" XHTML if the XML header is present
if(substr($content,0,5) == '<' . '?xml' ) {
$response->addHeader("Content-Type", "application/xhtml+xml; charset=" . self::$encoding);
$response->addHeader("Vary" , "Accept");
// Fix base tag $response->addHeader("Content-Type", "application/xhtml+xml; charset=" . self::$encoding);
$content = preg_replace('/<base href="([^"]*)"><!--\[if[[^\]*]\] \/><!\[endif\]-->/', $response->addHeader("Vary" , "Accept");
'<base href="$1" />', $content);
$content = str_replace('&nbsp;','&#160;', $content);
$content = str_replace('<br>','<br />', $content);
$content = preg_replace('#(<img[^>]*[^/>])>#i', '\\1/>', $content);
$response->setBody($content);
} else { // Fix base tag
return $this->html($response); $content = preg_replace('/<base href="([^"]*)"><!--\[if[[^\]*]\] \/><!\[endif\]-->/',
} '<base href="$1" />', $content);
$content = str_replace('&nbsp;','&#160;', $content);
$content = str_replace('<br>','<br />', $content);
$content = preg_replace('#(<img[^>]*[^/>])>#i', '\\1/>', $content);
$response->setBody($content);
} }
/* /*