From efcb4abfd0ceb8155626a9d55016a92601a4780c Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 20 Sep 2015 18:08:06 -0700 Subject: improve on the last attempt --- include/zot.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/zot.php b/include/zot.php index f01789216..e23bad4fe 100644 --- a/include/zot.php +++ b/include/zot.php @@ -2929,10 +2929,10 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { // These flags cannot be sync'd. // If these bits aren't set locally, remove the bits from the incoming flags. - if(! ($channel['channel_pageflags'] & PAGE_REMOVED)) - $arr['channel_pageflags'] = $arr['channel_pageflags'] & PAGE_REMOVED; - if(! ($channel['channel_pageflags'] & PAGE_SYSTEM)) - $arr['channel_pageflags'] = $arr['channel_pageflags'] & PAGE_SYSTEM; + if((! ($channel['channel_pageflags'] & PAGE_REMOVED)) && ($arr['channel_pageflags'] & PAGE_REMOVED)) + $arr['channel_pageflags'] = $arr['channel_pageflags'] - PAGE_REMOVED; + if((! ($channel['channel_pageflags'] & PAGE_SYSTEM)) && ($arr['channel_pageflags'] & PAGE_SYSTEM)) + $arr['channel_pageflags'] = $arr['channel_pageflags'] - PAGE_SYSTEM; $disallowed = array('channel_id','channel_account_id','channel_primary','channel_prvkey', 'channel_address', 'channel_notifyflags', 'channel_removed', 'channel_system', 'channel_deleted' ); -- cgit v1.2.3