Merge branch '3.2RC'

This commit is contained in:
Mario
2018-03-09 11:12:18 +01:00
1817 changed files with 80348 additions and 175116 deletions

View File

@@ -82,7 +82,8 @@ 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_password', 'channel_salt'
'channel_a_delegate', 'perm_limits', 'channel_password', 'channel_salt',
'channel_moved'
];
$clean = array();
@@ -185,7 +186,7 @@ function import_profiles($channel, $profiles) {
*
* @param array $channel
* @param array $hublocs
* @param unknown $seize
* @param boolean $seize
* @param boolean $moving (optional) default false
*/
function import_hublocs($channel, $hublocs, $seize, $moving = false) {