summaryrefslogtreecommitdiff
path: root/www/api/export_gcs.php
diff options
context:
space:
mode:
authorcweiske <cweiske@b3834d28-1941-0410-a4f8-b48e95affb8f>2010-03-17 20:11:21 +0000
committercweiske <cweiske@b3834d28-1941-0410-a4f8-b48e95affb8f>2010-03-17 20:11:21 +0000
commit4d3d00ade282e27b765a64c86f6607f1a92af2c0 (patch)
tree8d2bcb843c408552a870db4116fd7986db5ebb43 /www/api/export_gcs.php
parentdb7a46b23530724cf1a8d356de3ac4f1fe0d5ac7 (diff)
downloadsemanticscuttle-4d3d00ade282e27b765a64c86f6607f1a92af2c0.tar.gz
semanticscuttle-4d3d00ade282e27b765a64c86f6607f1a92af2c0.tar.bz2
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
Diffstat (limited to 'www/api/export_gcs.php')
-rw-r--r--www/api/export_gcs.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/www/api/export_gcs.php b/www/api/export_gcs.php
index 07bc726..9c0d85c 100644
--- a/www/api/export_gcs.php
+++ b/www/api/export_gcs.php
@@ -5,6 +5,7 @@
// Force HTTP authentication first!
//require_once('httpauth.inc.php');
+$httpContentType = false;
require_once '../www-header.php';
if($GLOBALS['enableGoogleCustomSearch'] == false) {
@@ -39,7 +40,7 @@ $bookmarks =& $bookmarkservice->getBookmarks(0, NULL, NULL, $tag, NULL, getSortO
// Set up the plain file and output all the posts.
-header('Content-Type: text/plain');
+header('Content-Type: text/plain; charset=utf-8');
if(!$xml) {
header('Content-Type: text/plain');
foreach($bookmarks['bookmarks'] as $row) {
@@ -48,7 +49,7 @@ if(!$xml) {
}
}
} else {
- header('Content-Type: application/xml');
+ header('Content-Type: text/xml');
echo '<GoogleCustomizations>'."\n";
echo ' <Annotations>'."\n";
foreach($bookmarks['bookmarks'] as $row) {