Disable XHTML Content-Type negotiation... You've foiled our plans for the last time!

XHTML mode breaks a lot of JS and has been causing trouble for Safari and Chrome, especially with the fancier new UI-side plugins like realtime and maps.

diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index c2ec83c284568d9f76d473e941ca29511bc3d019..d267526c8894f4063b3e8d620383a8591a14887a 100644 (file)
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -34,9 +34,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 require_once INSTALLDIR.'/lib/xmloutputter.php';
 
-define('PAGE_TYPE_PREFS',
-       'text/html,application/xhtml+xml,'.
-       'application/xml;q=0.3,text/xml;q=0.2');
+// Can include XHTML options but these are too fragile in practice.
+define('PAGE_TYPE_PREFS', 'text/html');
 
 /**
  * Low-level generator for HTML