From: x2000habouzit <x2000habouzit>
Date: Thu, 14 Oct 2004 22:32:02 +0000 (+0000)
Subject: geeky thing
X-Git-Tag: xorg/old~1280
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=38b3a906da1fbc1e3a43b5f4981fa025c4f50c02;p=platal.git

geeky thing
---

diff --git a/include/geoloc.inc.php b/include/geoloc.inc.php
index f000bab..6df245e 100644
--- a/include/geoloc.inc.php
+++ b/include/geoloc.inc.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: geoloc.inc.php,v 1.6 2004-08-31 21:43:47 x2000habouzit Exp $
+        $Id: geoloc.inc.php,v 1.7 2004-10-14 22:32:02 x2000habouzit Exp $
  ***************************************************************************/
 
 
@@ -69,4 +69,3 @@ function _geoloc_region_smarty($params){
 $page->register_function('geoloc_region', '_geoloc_region_smarty');
 
 ?>
-
diff --git a/include/xorg.page.inc.php b/include/xorg.page.inc.php
index e7e5f5e..a99b406 100644
--- a/include/xorg.page.inc.php
+++ b/include/xorg.page.inc.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: xorg.page.inc.php,v 1.45 2004-10-02 14:55:02 x2000habouzit Exp $
+        $Id: xorg.page.inc.php,v 1.46 2004-10-14 22:32:02 x2000habouzit Exp $
  ***************************************************************************/
 
 require("diogenes.core.page.inc.php");
@@ -128,6 +128,11 @@ class XorgPage extends DiogenesCorePage {
         if($this->_page_type == NO_SKIN)
             $this->display($this->_tpl);
         else {
+	    if (strpos($_SERVER['HTTP_ACCEPT'], 'application/xhtml+xml')!==false) {
+		header('Content-Type: application/xhtml+xml; charset=iso8859-1');
+	    } else {
+		header('Content-Type: text/html; charset=iso8859-1');
+	    }
             if(isset($_SESSION['suid'])) $this->caching=false;
             $id = $this->make_id($append_to_id);
             if($site_dev) {