aboutsummaryrefslogtreecommitdiffstats
path: root/include/import.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-04-12 17:32:28 -0700
committerzotlabs <mike@macgirvin.com>2017-04-12 17:32:28 -0700
commitd7f4526a00dba2c6a97bc4c231f57c7aa179a691 (patch)
tree644487c9c0c24e9b25b70c4e622eac165cb0b078 /include/import.php
parent57f20c0c2231099ce62dbdf2300e840114e8ce96 (diff)
downloadvolse-hubzilla-d7f4526a00dba2c6a97bc4c231f57c7aa179a691.tar.gz
volse-hubzilla-d7f4526a00dba2c6a97bc4c231f57c7aa179a691.tar.bz2
volse-hubzilla-d7f4526a00dba2c6a97bc4c231f57c7aa179a691.zip
backend infrastructure for 'channel protection password'; which will be used to optionally encrypt export files and resolve channel/identity ownership/hijacking disputes
Diffstat (limited to 'include/import.php')
-rw-r--r--include/import.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/import.php b/include/import.php
index 9007dbe74..224bb1803 100644
--- a/include/import.php
+++ b/include/import.php
@@ -82,7 +82,7 @@ function import_channel($channel, $account_id, $seize) {
'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', 'perm_limits'
+ 'channel_a_delegate', 'perm_limits', 'channel_password', 'channel_salt'
];
$clean = array();