Merge branch 'extended-cookie'

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..d4332f3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+config.inc.php
+cache/
+*~

diff --git a/api/posts_all.php b/api/posts_all.php
index 747741a695b94f0bf28f01a419a7976fa1f67335..9abf181e1b2e7a39a45807ba75ea5369b560de4f 100644 (file)
--- a/api/posts_all.php
+++ b/api/posts_all.php
@@ -52,7 +52,7 @@ foreach($bookmarks['bookmarks'] as $row) {
         $shared = "yes";
     }
 
-    echo "\t<post href=\"". filter($row['bAddress'], 'xml') .'" shared="' . $shared . '" description="'. filter($row['bTitle'], 'xml') .'" '. $description .'hash="'. md5($row['bAddress']) . ($row['bStatus'] ? '" shared="no' : '') .'" tag="'. filter($taglist, 'xml') .'" time="'. gmdate('Y-m-d\TH:i:s\Z', strtotime($row['bDatetime'])) ."\" />\r\n";
+    echo "\t<post href=\"". filter($row['bAddress'], 'xml') .'" shared="' . $shared . '" description="'. filter($row['bTitle'], 'xml') .'" '. $description .'hash="'. md5($row['bAddress']) .'" tag="'. filter($taglist, 'xml') .'" time="'. gmdate('Y-m-d\TH:i:s\Z', strtotime($row['bDatetime'])) ."\" />\r\n";
 }
 
 echo '</posts>';