SlatePermutate Changeset - e633a5f890a5 · protofusion repositories

Changeset - e633a5f890a5

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Nathan Brink (binki) - 15 years ago 2011-03-22 19:09:30
ohnobinki@ohnopublishing.net

Don't call header() to set the content type until Page::head() is called.

1 file changed with 3 insertions and 6 deletions:

inc/class.page.php

0 comments (0 inline, 0 general)

inc/class.page.php

➞

Show inline comments

@@ @@ -110,30 +110,25 @@ class page @@
     $this->headCode['outputPrintStyle'] = '<link rel="stylesheet" href="styles/print.css" type="text/css" media="screen" charset="utf-8" />';
     $this->headCode['outputStyle'] = '<link rel="stylesheet" href="styles/output.css" type="text/css" media="screen" charset="utf-8" />';
     $this->headCode['gliderHeadcode'] = '<link rel="stylesheet" href="styles/glider.css" type="text/css" media="screen" charset="utf-8" />';
     $this->headCode['uiTabsKeyboard'] = '<script type="text/javascript" src="scripts/uiTabsKeyboard.js"></script>';
     $this->headCode['displayTables'] = '<script type="text/javascript" src="scripts/displayTables.js"></script>';
     $this->pagetitle = $ntitle;
     $this->scripts = $nscripts;
    /* Compliant browsers which care, such as gecko, explicitly request xhtml: */
    if(empty($_SERVER['HTTP_ACCEPT'])  /* then the browser doesn't care :-) */
       || strpos($_SERVER['HTTP_ACCEPT'], 'application/xhtml+xml') !== FALSE)
+     {
        $this->xhtml = TRUE;
        header('Content-Type: application/xhtml+xml; charset=utf-8');
+     }
    else
      header('Content-Type: text/html; charset=utf-8');
    if (count($ga_trackers))
+     {
        $ga_www = 'http://www.';
        if ($_SERVER['SERVER_PORT'] != 80)
 	 $ga_www = 'https://ssl.';
        $this->trackingcode = '<script type="text/javascript" src="' . $ga_www . 'google-analytics.com/ga.js" />' . "\n"
 	 . $this->trackingcode
 	 . '  <script type="text/javascript">' . "\n"
 	 . '  ' . ($this->xhtml ? '<![CDATA[' : '') . "\n"
 	 . "     var mytrackers = new Array();";
@@ @@ -198,28 +193,30 @@ class page @@
     $this->headCode[$key] = $code;
     if ($enable) {
       $this->scripts[] = $key;
+    }
+  }
   /**
    * \brief
    *   Output the HTML header for a page, including <!DOCTYPE>, <head />, and opening structure
    */
   public function head()
+  {
     if ($this->xhtml) {
        header('Content-Type: application/xhtml+xml; charset=utf-8');
       echo '<?xml version="1.0" encoding="utf-8"?>' . PHP_EOL;
+    }
     else
       header('Content-Type: text/html; charset=utf-8');
     echo '<!DOCTYPE ' . $this->doctype . '>'. PHP_EOL .
 	  '<html ' . $this->htmlargs . '>'. PHP_EOL .
 	  '  <head>'. PHP_EOL .
 	  '    <title>' . $this->pagetitle . ' - ' . $this->base_title . '</title>'. PHP_EOL .
           '    <link rel="stylesheet" href="styles/general.css" type="text/css" media="screen" charset="utf-8" />'.  PHP_EOL .
 	  '    <link rel="stylesheet" type="text/css" media="print" href="styles/print.css" />'. PHP_EOL .
           '    <!--[if IE]>'. PHP_EOL .
           '      <link rel="stylesheet" type="text/css" media="screen" charset="utf-8" href="styles/ie.css" />'. PHP_EOL .
           '    <![endif]-->'. PHP_EOL .
           '    <link rel="shortcut icon" href="images/favicon.png" />'. PHP_EOL;

0 comments (0 inline, 0 general)