aboutsummaryrefslogtreecommitdiffstats
path: root/include/zot.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-09-26 13:25:34 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-09-26 13:25:34 -0700
commit9ab335626cdaad433c8f5b6d7fd4d980c1b37742 (patch)
tree7cf15fb099740a61b60b1ebaeb8e1c220c889c81 /include/zot.php
parent9bde18492a66c6657556307d22e88762df938f94 (diff)
downloadvolse-hubzilla-9ab335626cdaad433c8f5b6d7fd4d980c1b37742.tar.gz
volse-hubzilla-9ab335626cdaad433c8f5b6d7fd4d980c1b37742.tar.bz2
volse-hubzilla-9ab335626cdaad433c8f5b6d7fd4d980c1b37742.zip
import_xchan_photo: check the return headers to ensure it's an image content-type of some form as imagick chucks a wobbly if you try to initialise an image with an html error page.
Diffstat (limited to 'include/zot.php')
-rw-r--r--include/zot.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/zot.php b/include/zot.php
index 9bddb520d..ee3f603cd 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -2866,7 +2866,7 @@ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) {
// don't pass these elements, they should not be synchronised
- $disallowed = array('channel_id','channel_account_id','channel_primary','channel_prvkey','channel_address');
+ $disallowed = array('channel_id','channel_account_id','channel_primary','channel_prvkey','channel_address','channel_deleted','channel_removed','channel_system');
if(in_array($k,$disallowed))
continue;