Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 08:15:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge https://github.com/redmatrix/redmatrix into pending_merge

Browse source 
Conflicts:
	include/zot.php
This commit is contained in:
redmatrix 2015-09-27 18:03:40 -07:00
commit ed876a9c52
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/zot.php
View file

@ -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;
}