aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kostikov <max@kostikov.co>2019-05-04 10:32:31 +0200
committerMax Kostikov <max@kostikov.co>2019-05-04 10:32:31 +0200
commit66b370c421cd5b1c6e17da4f14b0f7ea3275b335 (patch)
treeb4b20ab75032e21fb3cc8d7eb462a8ed914488b4
parente7ef69e6e7323294205af4661d7ed9fa77e16527 (diff)
parent20bf139b3f4d74a6b21328a24c8f8fe5dad01102 (diff)
downloadvolse-hubzilla-66b370c421cd5b1c6e17da4f14b0f7ea3275b335.tar.gz
volse-hubzilla-66b370c421cd5b1c6e17da4f14b0f7ea3275b335.tar.bz2
volse-hubzilla-66b370c421cd5b1c6e17da4f14b0f7ea3275b335.zip
Merge branch 'dev' into 'dev'
strip obsolete channel_(rw)_photos from channel sync packets See merge request hubzilla/core!1630
-rw-r--r--include/import.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/import.php b/include/import.php
index 434a53f10..d0ec5918e 100644
--- a/include/import.php
+++ b/include/import.php
@@ -94,7 +94,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_removed', 'channel_deleted', 'channel_system'
+ 'channel_moved', 'channel_removed', 'channel_deleted', 'channel_system',
+ 'channel_r_photos', 'channel_w_photos'
];
$clean = array();