From 4d3d00ade282e27b765a64c86f6607f1a92af2c0 Mon Sep 17 00:00:00 2001
From: cweiske <cweiske@b3834d28-1941-0410-a4f8-b48e95affb8f>
Date: Wed, 17 Mar 2010 20:11:21 +0000
Subject: Fix bug #2960663: do not send content-type headers twice for ajax/api
 scripts

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@690 b3834d28-1941-0410-a4f8-b48e95affb8f
---
 src/SemanticScuttle/header.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/SemanticScuttle/header.php b/src/SemanticScuttle/header.php
index 12c1f72..ef36e83 100644
--- a/src/SemanticScuttle/header.php
+++ b/src/SemanticScuttle/header.php
@@ -107,6 +107,12 @@ $tplVars['userservice'] = $userservice;
 
 // 6 // Force UTF-8 behaviour for server (cannot be moved into top.inc.php which is not included into every file)
 if (!defined('UNIT_TEST_MODE')) {
-    header('Content-Type: text/html; charset=utf-8');
+    //API files define that, so we need a way to support both of them
+    if (!isset($httpContentType)) {
+        $httpContentType = 'text/html';
+    }
+    if ($httpContentType !== false) {
+        header('Content-Type: ' . $httpContentType . '; charset=utf-8');
+    }
 }
 ?>
-- 
cgit v1.2.3