diff options
| author | zotlabs <mike@macgirvin.com> | 2018-09-16 18:59:12 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-09-16 18:59:12 -0700 |
| commit | 6ab12597f508294d37fddeca789033c1729600d8 (patch) | |
| tree | e648c359cd1c0e04228ee3c0fad5e7add0649b5d | |
| parent | adc164b825c3b9e322921f2da9d1baf178b04cd3 (diff) | |
| download | volse-hubzilla-6ab12597f508294d37fddeca789033c1729600d8.tar.gz volse-hubzilla-6ab12597f508294d37fddeca789033c1729600d8.tar.bz2 volse-hubzilla-6ab12597f508294d37fddeca789033c1729600d8.zip | |
do not sync the channel_moved field
| -rw-r--r-- | include/import.php | 3 | ||||
| -rw-r--r-- | include/zot.php | 14 |
2 files changed, 9 insertions, 8 deletions
diff --git a/include/import.php b/include/import.php index 91a26b23b..0fc24a26f 100644 --- a/include/import.php +++ b/include/import.php @@ -93,7 +93,8 @@ function import_channel($channel, $account_id, $seize, $newname = '') { 'channel_w_comment', 'channel_w_mail', 'channel_w_like', 'channel_w_tagwall', 'channel_w_chat', 'channel_w_storage', 'channel_w_pages', 'channel_a_republish', 'channel_a_delegate', 'perm_limits', 'channel_password', 'channel_salt', - 'channel_moved' + 'channel_moved', 'channel_primary', 'channel_removed', 'channel_deleted', + 'channel_system' ]; $clean = array(); diff --git a/include/zot.php b/include/zot.php index e8ac2df02..b29e86dfa 100644 --- a/include/zot.php +++ b/include/zot.php @@ -3573,13 +3573,13 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { } $disallowed = [ - 'channel_id', 'channel_account_id', 'channel_primary', 'channel_prvkey', - 'channel_address', 'channel_notifyflags', 'channel_removed', 'channel_deleted', - 'channel_system', 'channel_r_stream', 'channel_r_profile', 'channel_r_abook', - 'channel_r_storage', 'channel_r_pages', 'channel_w_stream', 'channel_w_wall', - 'channel_w_comment', 'channel_w_mail', 'channel_w_like', 'channel_w_tagwall', - 'channel_w_chat', 'channel_w_storage', 'channel_w_pages', 'channel_a_republish', - 'channel_a_delegate' + 'channel_id', 'channel_account_id', 'channel_primary', 'channel_prvkey', + 'channel_address', 'channel_notifyflags', 'channel_removed', 'channel_deleted', + 'channel_system', 'channel_r_stream', 'channel_r_profile', 'channel_r_abook', + 'channel_r_storage', 'channel_r_pages', 'channel_w_stream', 'channel_w_wall', + 'channel_w_comment', 'channel_w_mail', 'channel_w_like', 'channel_w_tagwall', + 'channel_w_chat', 'channel_w_storage', 'channel_w_pages', 'channel_a_republish', + 'channel_a_delegate', 'channel_moved' ]; $clean = array(); |