diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-09-20 18:10:25 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-09-20 18:10:25 -0700 |
| commit | 177292de13d6787bc9d539f867ff850f0476bd67 (patch) | |
| tree | f8725efb82055989158f1e01d90bf2f95dea7806 | |
| parent | 1501d1c5704cf08e5fa8591aa0952be3bc3067e2 (diff) | |
| parent | efcb4abfd0ceb8155626a9d55016a92601a4780c (diff) | |
| download | volse-hubzilla-177292de13d6787bc9d539f867ff850f0476bd67.tar.gz volse-hubzilla-177292de13d6787bc9d539f867ff850f0476bd67.tar.bz2 volse-hubzilla-177292de13d6787bc9d539f867ff850f0476bd67.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/zot.php
| -rw-r--r-- | include/zot.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/zot.php b/include/zot.php index 2f291ec31..dd5448a6c 100644 --- a/include/zot.php +++ b/include/zot.php @@ -2941,11 +2941,9 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { if(array_key_exists('channel',$arr) && is_array($arr['channel']) && count($arr['channel'])) { - - if(array_key_exists('channel_pageflags',$arr['channel']) && intval($arr['channel']['channel_pageflags'])) { // These flags cannot be sync'd. - // If these bits aren't set locally, remove the bits from the incoming flags. + // remove the bits from the incoming flags. if($arr['channel_pageflags'] & 0x8000) $arr['channel_pageflags'] = $arr['channel_pageflags'] - 0x8000; |