aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-07-15 18:21:04 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-07-15 18:21:04 -0700
commit7f6e4d5f4a56355b01fd1ccdf433f4b215b3d669 (patch)
tree47f195e793971425a6e207c642077513c9a390ca
parent95cf1668de7cd584e25ee7c66cfaaa0183979f20 (diff)
downloadvolse-hubzilla-7f6e4d5f4a56355b01fd1ccdf433f4b215b3d669.tar.gz
volse-hubzilla-7f6e4d5f4a56355b01fd1ccdf433f4b215b3d669.tar.bz2
volse-hubzilla-7f6e4d5f4a56355b01fd1ccdf433f4b215b3d669.zip
more clone sync issues across projects
-rw-r--r--include/zot.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/zot.php b/include/zot.php
index 4342a806a..c4860cc3b 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -2854,12 +2854,12 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
}
if(array_key_exists('channel',$arr) && is_array($arr['channel']) && count($arr['channel'])) {
- if(array_key_exists('channel_removed',$arr['channel']))
- $arr['channel_pageflags'] |= PAGE_REMOVED;
- if(array_key_exists('channel_system',$arr['channel']))
- $arr['channel_pageflags'] |= PAGE_SYSTEM;
+ if(array_key_exists('channel_page_flags',$arr['channel']) && intval($arr['channel']['channel_pageflags'])) {
+ $arr['channel']['channel_removed'] = (($arr['channel']['channel_pageflags'] & 0x8000) ? 1 : 0);
+ $arr['channel']['channel_system'] = (($arr['channel']['channel_pageflags'] & 0x1000) ? 1 : 0);
+ }
- $disallowed = array('channel_id','channel_account_id','channel_primary','channel_prvkey', 'channel_address', 'channel_notifyflags', 'channel_removed', 'channel_system');
+ $disallowed = array('channel_id','channel_account_id','channel_primary','channel_prvkey', 'channel_address', 'channel_notifyflags');
$clean = array();
foreach($arr['channel'] as $k => $v) {