summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@status.net>2009-09-30 13:51:47 +0200
committerSarven Capadisli <csarven@status.net>2009-09-30 13:51:47 +0200
commitd37be603ca42bcd5c9867f011987b2e2c3993e64 (patch)
tree40047bf30685cd9657d4a64cb97f3388589992c2
parentfd8941df852aa06a5ef5020e58d0322f56e50782 (diff)
parent7bd65a7b86d7d694d28e81f7d6897cbefd9d9e1d (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
-rw-r--r--lib/htmloutputter.php10
-rw-r--r--lib/util.php2
2 files changed, 7 insertions, 5 deletions
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index aa01f6b1d..64be745be 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -106,14 +106,16 @@ class HTMLOutputter extends XMLOutputter
}
}
- header('Content-Type: '.$type);
+ header('Content-Type: '.$type.'; charset=UTF-8');
$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();
diff --git a/lib/util.php b/lib/util.php
index d249b154f..44a377220 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1165,7 +1165,7 @@ function common_negotiate_type($cprefs, $sprefs)
}
if ('text/html' === $besttype) {
- return "text/html; charset=utf-8";
+ return "text/html";
}
return $besttype;
}