diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-11 06:42:11 +0200 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-11 06:42:11 +0200 |
| commit | edb1473f13a87ccfdfe2555ac9ab798fbc073805 (patch) | |
| tree | 18a15afbca3cdbbf262e0737d01e23e7b4905cf1 /include/Import/import_diaspora.php | |
| parent | 2f73d24ab134391c3b3a69d5cbfede42e028b5ed (diff) | |
| parent | f2171173fe2c9a0596672da293eb756a514ff789 (diff) | |
| download | volse-hubzilla-edb1473f13a87ccfdfe2555ac9ab798fbc073805.tar.gz volse-hubzilla-edb1473f13a87ccfdfe2555ac9ab798fbc073805.tar.bz2 volse-hubzilla-edb1473f13a87ccfdfe2555ac9ab798fbc073805.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/Import/import_diaspora.php')
| -rw-r--r-- | include/Import/import_diaspora.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/Import/import_diaspora.php b/include/Import/import_diaspora.php index fca9fa4f2..a0f473b50 100644 --- a/include/Import/import_diaspora.php +++ b/include/Import/import_diaspora.php @@ -57,6 +57,10 @@ function import_diaspora($data) { $channel_id = $c['channel']['channel_id']; + // Hubzilla only: Turn on the Diaspora protocol so that follow requests will be sent. + + set_pconfig($channel_id,'system','diaspora_allowed','1'); + // todo - add auto follow settings, (and strip exif in hubzilla) $location = escape_tags($data['user']['profile']['location']); @@ -70,7 +74,6 @@ function import_diaspora($data) { ); if($data['user']['profile']['nsfw']) { - // fixme for hubzilla which doesn't use pageflags any more q("update channel set channel_pageflags = (channel_pageflags | %d) where channel_id = %d", intval(PAGE_ADULT), intval($channel_id) |