nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #3796 from annando/ostatus-forum

Browse source 
OStatus: Auto subscribe to forum accounts
This commit is contained in:
Tobias Diekershoff 2017-10-17 08:30:05 +02:00 committed by GitHub
parent 6640e6ceef 5498f04ffa
commit ae1afebe26
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/items.php
View file

@ -1703,7 +1703,7 @@ function new_follower($importer, $contact, $datarray, $item, $sharing = false) {
intval($importer['uid'])
);
if (dbm::is_result($r) && !in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE))) {
if (dbm::is_result($r) && !in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_COMMUNITY))) {
// create notification
$hash = random_string();
@ -1739,7 +1739,7 @@ function new_follower($importer, $contact, $datarray, $item, $sharing = false) {
));
}
} elseif (dbm::is_result($r) && in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE))) {
} elseif (dbm::is_result($r) && in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_COMMUNITY))) {
$r = q("UPDATE `contact` SET `pending` = 0 WHERE `uid` = %d AND `url` = '%s' AND `pending` LIMIT 1",
intval($importer['uid']),
dbesc($url)