diff options
| author |  Christian Weiske | 2010-08-12 20:49:35 +0200 |
|---|---|---|
| committer | Christian Weiske | 2010-08-12 20:49:35 +0200 |
| commit | 0a8dadf87e660e9bf205581f12f7af87bfabf6ca (patch) | |
| tree | a1218f869401a1ffff764a58c28a0be674ba5362 /www/api/export_gcs.php | |
| parent | b25290cef48251a31cb0f693a53677b566c1b1a4 (diff) | |
| parent | 31570df64ce6543de407e7b9d751ba9033d930de (diff) | |
| download | scuttle-0a8dadf87e660e9bf205581f12f7af87bfabf6ca.tar.gz scuttle-0a8dadf87e660e9bf205581f12f7af87bfabf6ca.zip | |
Merge branch 'master' into pearpkg
Diffstat (limited to 'www/api/export_gcs.php')
| -rw-r--r-- | www/api/export_gcs.php | 5 |
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) { |