diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2009-02-26 13:22:51 -0800 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2009-02-26 13:22:51 -0800 |
commit | 34a61b40f47a52d1fdcf7cd907f3ac53b96b038e (patch) | |
tree | 14ddeb18d9e020760d8c2308a12d858b6eab4a17 /lib/htmloutputter.php | |
parent | 478192fa3b2375a0ff0a5ff03956381e5da7a6ac (diff) | |
parent | 8c3fe83c645265a11a3fca80cac2ac48ea72cdab (diff) |
Merge branch '0.7.x' into 0.8.x
Diffstat (limited to 'lib/htmloutputter.php')
-rw-r--r-- | lib/htmloutputter.php | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php index 7780b1c19..06603ac05 100644 --- a/lib/htmloutputter.php +++ b/lib/htmloutputter.php @@ -101,29 +101,32 @@ class HTMLOutputter extends XMLOutputter $type = common_negotiate_type($cp, $sp); if (!$type) { - common_user_error(_('This page is not available in a '. - 'media type you accept'), 406); - exit(0); + throw new ClientException(_('This page is not available in a '. + 'media type you accept'), 406); } } header('Content-Type: '.$type); - + $this->extraHeaders(); $this->startXML('html', '-//W3C//DTD XHTML 1.0 Strict//EN', 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'); - // FIXME: correct language for interface - - $language = common_language(); + $language = $this->getLanguage(); $this->elementStart('html', array('xmlns' => 'http://www.w3.org/1999/xhtml', 'xml:lang' => $language, 'lang' => $language)); } + function getLanguage() + { + // FIXME: correct language for interface + return common_language(); + } + /** * Ends an HTML document * @@ -134,7 +137,7 @@ class HTMLOutputter extends XMLOutputter $this->elementEnd('html'); $this->endXML(); } - + /** * To specify additional HTTP headers for the action * @@ -255,7 +258,7 @@ class HTMLOutputter extends XMLOutputter foreach ($content as $value => $option) { if ($value == $selected) { $this->element('option', array('value' => $value, - 'selected' => $value), + 'selected' => 'selected'), $option); } else { $this->element('option', array('value' => $value), $option); |