aboutsummaryrefslogtreecommitdiffstats
path: root/include/items.php
diff options
context:
space:
mode:
authorroot <root@diekershoff.homeunix.net>2011-01-04 14:21:43 +0100
committerroot <root@diekershoff.homeunix.net>2011-01-04 14:21:43 +0100
commitcbace1639e7eb9c543a2ba0b51619a7f4164ae64 (patch)
tree8386dd0848a3ed4e2190ef1f75f6698d44811edd /include/items.php
parent51bcfb649fe2a20c9b8b1e66bc59e39da80d326b (diff)
parent64628c800d711c3a3c28e2bf94efd7e8b26a5eba (diff)
downloadvolse-hubzilla-cbace1639e7eb9c543a2ba0b51619a7f4164ae64.tar.gz
volse-hubzilla-cbace1639e7eb9c543a2ba0b51619a7f4164ae64.tar.bz2
volse-hubzilla-cbace1639e7eb9c543a2ba0b51619a7f4164ae64.zip
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'include/items.php')
-rw-r--r--include/items.php12
1 files changed, 11 insertions, 1 deletions
diff --git a/include/items.php b/include/items.php
index 0c055f571..61bc0c5d7 100644
--- a/include/items.php
+++ b/include/items.php
@@ -420,9 +420,19 @@ function get_atom_elements($feed,$item) {
$rawverb = $item->get_item_tags(NAMESPACE_ACTIVITY, 'verb');
+
// select between supported verbs
- if($rawverb)
+
+ if($rawverb) {
$res['verb'] = unxmlify($rawverb[0]['data']);
+ }
+
+ // translate OStatus unfollow to activity streams if it happened to get selected
+
+ if((x($res,'verb')) && ($res['verb'] === 'http://ostatus.org/schema/1.0/unfollow'))
+ $res['verb'] = ACTIVITY_UNFOLLOW;
+
+
$rawobj = $item->get_item_tags(NAMESPACE_ACTIVITY, 'object');