From 9ab335626cdaad433c8f5b6d7fd4d980c1b37742 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sat, 26 Sep 2015 13:25:34 -0700 Subject: 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. --- include/zot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/zot.php') 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; -- cgit v1.2.3