diff options
| author | Christian Weiske <cweiske@cweiske.de> | 2011-11-01 06:42:00 +0100 |
|---|---|---|
| committer | Christian Weiske <cweiske@cweiske.de> | 2011-11-01 06:42:00 +0100 |
| commit | db6011331290fcbe453b3f5b5560c59f60c4ee34 (patch) | |
| tree | 5481606b541164f7596d3b048f226703db397045 | |
| parent | a1b909ceb5f48c510abc52b82a567fd80d113ced (diff) | |
| parent | e81599e4375b4ae12ff7fe65e0810479ad719b4a (diff) | |
| download | semanticscuttle-db6011331290fcbe453b3f5b5560c59f60c4ee34.tar.gz semanticscuttle-db6011331290fcbe453b3f5b5560c59f60c4ee34.tar.bz2 | |
Merge branch '0.98'
Conflicts:
doc/ChangeLog
| -rw-r--r-- | doc/ChangeLog | 1 | ||||
| -rw-r--r-- | www/api/opensearch.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog index 7e3a064..50015c8 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -9,6 +9,7 @@ ChangeLog for SemantiScuttle - Fix bug: Subtitle was not escaped - Fix bug #3393951: Logo images missing on bookmark page - Fix bug #3388219: Incorrect URL when cancelling tag2tag-actions +- Fix bug #3399815: PHP error in opensearch API in 0.98.3 0.98.3 - 2011-08-09 diff --git a/www/api/opensearch.php b/www/api/opensearch.php index db95639..3e7dbf7 100644 --- a/www/api/opensearch.php +++ b/www/api/opensearch.php @@ -1,8 +1,8 @@ <?php $httpContentType = 'text/xml'; require_once '../www-header.php'; +echo '<' . '?xml version="1.0" encoding="utf-8" ?' . ">\n"; ?> -<?xml version="1.0" encoding="utf-8" ?> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> <ShortName><?php echo $GLOBALS['sitename']?></ShortName> <LongName></LongName> |