aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-09-20 18:08:06 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-09-20 18:08:06 -0700
commitefcb4abfd0ceb8155626a9d55016a92601a4780c (patch)
tree1f78b0c8e4c40f09737a8e6cb5a5c065c1c78d9b
parent59a56ac77fcef3348bcf82db043d526b33f5bc9f (diff)
downloadvolse-hubzilla-efcb4abfd0ceb8155626a9d55016a92601a4780c.tar.gz
volse-hubzilla-efcb4abfd0ceb8155626a9d55016a92601a4780c.tar.bz2
volse-hubzilla-efcb4abfd0ceb8155626a9d55016a92601a4780c.zip
improve on the last attempt
-rw-r--r--include/zot.php8
1 files 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' );