diff options
| author | Christian Weiske <cweiske@cweiske.de> | 2010-08-12 20:49:35 +0200 |
|---|---|---|
| committer | Christian Weiske <cweiske@cweiske.de> | 2010-08-12 20:49:35 +0200 |
| commit | 0a8dadf87e660e9bf205581f12f7af87bfabf6ca (patch) | |
| tree | a1218f869401a1ffff764a58c28a0be674ba5362 /src/SemanticScuttle/header.php | |
| parent | b25290cef48251a31cb0f693a53677b566c1b1a4 (diff) | |
| parent | 31570df64ce6543de407e7b9d751ba9033d930de (diff) | |
| download | semanticscuttle-0a8dadf87e660e9bf205581f12f7af87bfabf6ca.tar.gz semanticscuttle-0a8dadf87e660e9bf205581f12f7af87bfabf6ca.tar.bz2 | |
Merge branch 'master' into pearpkg
Diffstat (limited to 'src/SemanticScuttle/header.php')
| -rw-r--r-- | src/SemanticScuttle/header.php | 8 |
1 files changed, 7 insertions, 1 deletions
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'); + } } ?> |