harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve on the last attempt

Browse Source
This commit is contained in:
redmatrix
2015-09-20 18:08:06 -07:00
parent 59a56ac77f
commit efcb4abfd0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/zot.php
View File

@@ -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' );