# HG changeset patch
# User Ethan Zonca
# Date 2010-10-27 19:41:59
# Node ID 2aa7bc68379dbc0ca5965aa2f79d305ea9a37da0
# Parent b5255767fa866ae91cf98e30d845065ffbc9edb8
# Parent 4e1fd8bb67843f8bef11180f8e52f34c814c9d88
Merge
diff --git a/inc/class.page.php b/inc/class.page.php
--- a/inc/class.page.php
+++ b/inc/class.page.php
@@ -70,8 +70,10 @@ class page
|| !strlen($_SERVER['HTTP_ACCEPT']) /* then the browser doesn't care :-) */)
{
$this->xhtml = TRUE;
- header('Content-type: application/xhtml+xml');
+ header('Content-Type: application/xhtml+xml; charset=utf-8');
}
+ else
+ header('Content-Type: text/html; charset=utf-8');
if (count($ga_trackers))
{
@@ -127,7 +129,12 @@ class page
// Public functions/vars
- public function head(){
+ /**
+ * \brief
+ * Output the HTML header for a page, including the and
+ */
+ public function head()
+ {
$this->pageGenTime = round(microtime(), 3);
if ($this->xhtml)
@@ -141,9 +148,8 @@ class page
';
// Write out all passed scripts
- foreach ($this->scripts as $i){
- echo $this->headCode["$i"];
- }
+ foreach ($this->scripts as $i)
+ echo ' ' . $this->headCode["$i"] . "\n";
echo '
bodyargs.' >';