aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-09-27 18:03:40 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-09-27 18:03:40 -0700
commited876a9c529f59fa62bb45805aa4f355fe0e2c0d (patch)
tree8b8d177e6815460e526590635458c5fd823c1224
parent55b530f0fdaeaee8dc8cb8be627e5418b8b0489a (diff)
parent67fe8fc4a7aa229857249caeaeb7d746d92ba325 (diff)
downloadvolse-hubzilla-ed876a9c529f59fa62bb45805aa4f355fe0e2c0d.tar.gz
volse-hubzilla-ed876a9c529f59fa62bb45805aa4f355fe0e2c0d.tar.bz2
volse-hubzilla-ed876a9c529f59fa62bb45805aa4f355fe0e2c0d.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts: include/zot.php
-rw-r--r--include/zot.php10
1 files changed, 6 insertions, 4 deletions
diff --git a/include/zot.php b/include/zot.php
index 4d4877eba..0c6a2f368 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -3001,10 +3001,12 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
// These flags cannot be sync'd.
// remove the bits from the incoming flags.
- if($arr['channel_pageflags'] & 0x8000)
- $arr['channel_pageflags'] = $arr['channel_pageflags'] - 0x8000;
- if($arr['channel_pageflags'] & 0x1000)
- $arr['channel_pageflags'] = $arr['channel_pageflags'] - 0x1000;
+ // These correspond to PAGE_REMOVED and PAGE_SYSTEM on redmatrix
+
+ if($arr['channel']['channel_pageflags'] & 0x8000)
+ $arr['channel']['channel_pageflags'] = $arr['channel']['channel_pageflags'] - 0x8000;
+ if($arr['channel']['channel_pageflags'] & 0x1000)
+ $arr['channel']['channel_pageflags'] = $arr['channel']['channel_pageflags'] - 0x1000;
}