diff options
author | Christian Weiske <cweiske@cweiske.de> | 2011-04-06 19:13:19 +0200 |
---|---|---|
committer | Christian Weiske <cweiske@cweiske.de> | 2011-04-06 19:13:19 +0200 |
commit | 7379805565815c576723b888a20af080248222da (patch) | |
tree | 498c98e8b6c43c2729349b7680c6a20efcfb98f3 /www/api/export_html.php | |
parent | 1e3cd8bf6ee636a5af692b57906612d6109849cb (diff) | |
parent | 12c77161aca2c7d76fa5154fa1f4e214106d834b (diff) | |
download | SemanticScuttle-origin/quickform.zip SemanticScuttle-origin/quickform.tar.gz SemanticScuttle-origin/quickform.tar.bz2 |
Merge branch 'master' into quickformorigin/quickform
Conflicts:
data/templates/bookmarks.tpl.php
data/templates/sidebar.block.search.php
data/templates/top.inc.php
doc/developers/TODO
src/SemanticScuttle/header.php
Diffstat (limited to 'www/api/export_html.php')
-rw-r--r-- | www/api/export_html.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/www/api/export_html.php b/www/api/export_html.php index c7c8cf4..33401e7 100644 --- a/www/api/export_html.php +++ b/www/api/export_html.php @@ -22,6 +22,8 @@ // del.icio.us behavior: // - doesn't include the filtered tag as an attribute on the root element (we do) +//this page here is really not valid in any way +$httpContentType = 'text/html'; // Force HTTP authentication first! require_once 'httpauth.inc.php'; |