diff options
| author | Evan Prodromou <evan@status.net> | 2009-10-01 11:30:04 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-10-01 11:30:04 -0400 |
| commit | a41ed1a66a902b078876be7528183ab61e6a3d03 (patch) | |
| tree | db690c52820ebd4aefae6222cb4f3b48c2d9398f /lib/htmloutputter.php | |
| parent | 3449843f839b6c17618b27b031c608860761cd32 (diff) | |
| parent | acc78972383c2346b5729192ab00c90c48c5b2a6 (diff) | |
Merge branch '0.9.x' into schema
Diffstat (limited to 'lib/htmloutputter.php')
| -rw-r--r-- | lib/htmloutputter.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php index aa01f6b1d..c70f96537 100644 --- a/lib/htmloutputter.php +++ b/lib/htmloutputter.php @@ -109,11 +109,13 @@ class HTMLOutputter extends XMLOutputter header('Content-Type: '.$type); $this->extraHeaders(); - if( ! substr($type,0,strlen('text/html'))=='text/html' ){ - // Browsers don't like it when <?xml it output for non-xhtml documents + if (preg_match("/.*\/.*xml/", $type)) { + // Required for XML documents $this->xw->startDocument('1.0', 'UTF-8'); } - $this->xw->writeDTD('html'); + $this->xw->writeDTD('html', + '-//W3C//DTD XHTML 1.0 Strict//EN', + 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'); $language = $this->getLanguage(); |