Changeset 409

Timestamp:

2011-01-01 15:58:59 (1 year ago)

Author:

hannes

Message:

Always send text/html MIME type.
The regular XHTML type causes too many problems
with common browsers.

Files:

• trunk/classes/pages/Page.php (modified) (1 diff)

trunk/classes/pages/Page.php

@@ -706 +706 @@
-    public function send($html) {
-        global $SETTINGS;
-
-
-
+
-        $mime = 'text/html';
-        if ($html->asXML() !== FALSE) {
-            if (stristr($_SERVER['HTTP_ACCEPT'], 'application/xhtml+xml')) {
-                if (preg_match('/application\/xhtml\+xml;q=([01]|0\.\d{1,3}|1\.0)/i', $_SERVER['HTTP_ACCEPT'], $matches)) {
-                    // priority of XHTML
-                    $xhtml_q = $matches[1];
-                    if (preg_match('/text\/html;q=q=([01]|0\.\d{1,3}|1\.0)/i', $_SERVER['HTTP_ACCEPT'], $matches)) {
-                        // priority of HTML
-                        $html_q = $matches[1];
-                        if ((float)$xhtml_q >= (float)$html_q) {
-                            /* browser prefers XHTML over HTML, so send the document as such;
-                             * this guarantees faster and more reliable rendering */
-                            $mime = 'application/xhtml+xml';
-                        }
-                    }
-                } else {
-                    /* browser accepts XHTML, but script can't figure out which one it prefers;
-                     * send as XHTML */
-                    $mime = 'application/xhtml+xml';
-                }
-            }
-        }
-        // start output with the document headers
-        header('Content-Type: ' . $mime . '; charset=' . $SETTINGS['encoding']);