diff options
author | Mario Vavti <mario@mariovavti.com> | 2018-04-16 09:24:22 +0200 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2018-04-16 09:24:22 +0200 |
commit | a8b78dc1f5080629717adc2d942399096397819d (patch) | |
tree | 5ef9fe5a50ce20c4a4151476e251f06e0df24dbf /Zotlabs/Lib | |
parent | bbe58dd550cbcc6f31c42dd55a326f971952c884 (diff) | |
parent | 19888b95cc99a4a1333431909067b8147de7892c (diff) | |
download | volse-hubzilla-a8b78dc1f5080629717adc2d942399096397819d.tar.gz volse-hubzilla-a8b78dc1f5080629717adc2d942399096397819d.tar.bz2 volse-hubzilla-a8b78dc1f5080629717adc2d942399096397819d.zip |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Lib')
-rw-r--r-- | Zotlabs/Lib/NativeWiki.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Zotlabs/Lib/NativeWiki.php b/Zotlabs/Lib/NativeWiki.php index 7642dbb3e..6f916216e 100644 --- a/Zotlabs/Lib/NativeWiki.php +++ b/Zotlabs/Lib/NativeWiki.php @@ -171,16 +171,23 @@ class NativeWiki { dbesc(NWIKI_ITEM_RESOURCE_TYPE), dbesc($resource_id) ); + if($r) { $q = q("select * from item where resource_type = 'nwikipage' and resource_id = '%s'", - dbesc($r[0]['resource_type']) + dbesc($r[0]['resource_id']) ); if($q) { $r = array_merge($r,$q); } xchan_query($r); $sync_item = fetch_post_tags($r); - build_sync_packet($uid,array('wiki' => array(encode_item($sync_item[0],true)))); + if($sync_item) { + $pkt = []; + foreach($sync_item as $w) { + $pkt[] = encode_item($w,true); + } + build_sync_packet($uid,array('wiki' => $pkt)); + } } } |