aboutsummaryrefslogtreecommitdiffstats
path: root/include/import.php
diff options
context:
space:
mode:
authorgit-marijus <mario@mariovavti.com>2017-04-13 12:08:17 +0200
committerGitHub <noreply@github.com>2017-04-13 12:08:17 +0200
commit2aa69257a4a56b42004e6c758ded644e85071ad9 (patch)
tree107e61f6b8b665f51c8826151b675a34e7f4e4cd /include/import.php
parent7b173a75e47cfdf9f46b7d635df84b2be286b0e6 (diff)
parent9d425b472722e7ca33e93e09bb330763bed2d257 (diff)
downloadvolse-hubzilla-2aa69257a4a56b42004e6c758ded644e85071ad9.tar.gz
volse-hubzilla-2aa69257a4a56b42004e6c758ded644e85071ad9.tar.bz2
volse-hubzilla-2aa69257a4a56b42004e6c758ded644e85071ad9.zip
Merge pull request #715 from zotlabs/cpp
backend infrastructure for 'channel protection password'; which will …
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();