aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-09-22 16:26:28 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-09-22 16:26:28 -0700
commit1d7d9818fabcdf2bd34e9e9355c97045dd4ef359 (patch)
tree4952f393a8a4608e9a80c327862e058aae9e2df9
parent7dd61c05dcf169807aed91d305ea235bcaa9035e (diff)
parentc2dcc6880302406de6e1abf90c985975e8a4f13a (diff)
downloadvolse-hubzilla-1d7d9818fabcdf2bd34e9e9355c97045dd4ef359.tar.gz
volse-hubzilla-1d7d9818fabcdf2bd34e9e9355c97045dd4ef359.tar.bz2
volse-hubzilla-1d7d9818fabcdf2bd34e9e9355c97045dd4ef359.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts: include/items.php include/zot.php
-rwxr-xr-xinclude/items.php1
-rw-r--r--include/zot.php9
2 files changed, 10 insertions, 0 deletions
diff --git a/include/items.php b/include/items.php
index b209e55c5..7793d1fb2 100755
--- a/include/items.php
+++ b/include/items.php
@@ -836,6 +836,7 @@ function title_is_body($title, $body) {
function get_item_elements($x,$allow_code = false) {
$arr = array();
+
if($allow_code)
$arr['body'] = $x['body'];
else
diff --git a/include/zot.php b/include/zot.php
index 4b4be477f..714bdd3df 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -3312,6 +3312,14 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
}
}
+
+ if(array_key_exists('item',$arr) && $arr['item'])
+ sync_items($channel,$arr['item']);
+
+ if(array_key_exists('item_id',$arr) && $arr['item_id'])
+ sync_items($channel,$arr['item_id']);
+
+
$result[] = array($d['hash'],'channel sync updated',$channel['channel_name'],'');
}
@@ -3754,4 +3762,5 @@ function zotinfo($arr) {
}
call_hooks('zot_finger',$ret);
return($ret);
+
}