From cf4036104b5fffd63473dfa53f44fd15ef4d1727 Mon Sep 17 00:00:00 2001
From: Christian Weiske <cweiske@cweiske.de>
Date: Tue, 16 Aug 2011 20:09:41 +0200
Subject: fix sioc export

---
 www/api/export_sioc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'www/api')

diff --git a/www/api/export_sioc.php b/www/api/export_sioc.php
index 8bdfd70..47ffc96 100644
--- a/www/api/export_sioc.php
+++ b/www/api/export_sioc.php
@@ -67,9 +67,9 @@ $bookmarks =& $bookmarkservice->getBookmarks(0, NULL, NULL, NULL);
 <?php foreach($bookmarks['bookmarks'] as $bookmark): ?>
 <bm:Bookmark rdf:about="<?php echo createUrl('history', $bookmark['bHash']) ?>">
   <dc:title><?php echo filter($bookmark['bTitle']) ?></dc:title>
-  <dc:created><?php echo filter($bookmark['bCreated']) ?></dc:created>
+  <dc:created><?php echo filter($bookmark['bDatetime']) ?></dc:created>
   <dc:description><?php echo filter(strip_tags($bookmark['bDescription'])) ?></dc:description>
-  <dc:date><?php echo $bookmark['bDateTime'] ?></dc:date>
+  <dc:date><?php echo $bookmark['bModified'] ?></dc:date>
   <bm:recalls rdf:resource="<?php echo filter($bookmark['bAddress']) ?>"/>
   <sioc:owner_of rdf:resource="<?php echo createUrl('profile', $usersArray[$bookmark['uId']]) ?>"/>
   <?php foreach($bookmark['tags'] as $tag): ?>
-- 
cgit v1.2.3


From e81599e4375b4ae12ff7fe65e0810479ad719b4a Mon Sep 17 00:00:00 2001
From: Christian Weiske <cweiske@cweiske.de>
Date: Tue, 1 Nov 2011 06:41:25 +0100
Subject: Fix bug #3399815: PHP error in opensearch API in 0.98.3

---
 doc/ChangeLog          | 1 +
 www/api/opensearch.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'www/api')

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>
-- 
cgit v1.2.3