friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

first forum test

Browse source
This commit is contained in:
friendica 2011-11-19 03:06:15 -08:00
parent 6463543832
commit 72dd6457b0
2 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
include/items.php
View file

@ -2033,13 +2033,12 @@ function local_delivery($importer,$data) {
$community = false; $community = false;
// if($importer['page-flags'] == PAGE_COMMUNITY) { if($importer['page-flags'] == PAGE_COMMUNITY) {
// $sql_extra = ''; $sql_extra = '';
// $community = true; $community = true;
// logger('local_delivery: community reply'); logger('local_delivery: community reply');
// } }
// else else
$sql_extra = " and contact.self = 1 and item.wall = 1 "; $sql_extra = " and contact.self = 1 and item.wall = 1 ";
// was the top-level post for this reply written by somebody on this site? // was the top-level post for this reply written by somebody on this site?
@ -2113,14 +2112,14 @@ function local_delivery($importer,$data) {
} }
} }
if($community) { // if($community) {
$newtag = '@[url=' . $a->get_baseurl() . '/profile/' . $importer['nickname'] . ']' . $importer['username'] . '[/url]'; // $newtag = '@[url=' . $a->get_baseurl() . '/profile/' . $importer['nickname'] . ']' . $importer['username'] . '[/url]';
if(! stristr($datarray['tag'],$newtag)) { // if(! stristr($datarray['tag'],$newtag)) {
if(strlen($datarray['tag'])) // if(strlen($datarray['tag']))
$datarray['tag'] .= ','; // $datarray['tag'] .= ',';
$datarray['tag'] .= $newtag; // $datarray['tag'] .= $newtag;
} // }
} // }
$posted_id = item_store($datarray); $posted_id = item_store($datarray);

12
include/notifier.php
View file

@ -218,6 +218,11 @@ function notifier_run($argv, $argc){
$relay_to_owner = true; $relay_to_owner = true;
} }
if(($cmd === 'uplink') && (intval($parent['forum_mode'])) && (! $top_level)) {
$relay_to_owner = true;
}
// until the 'origin' flag has been in use for several months // until the 'origin' flag has been in use for several months
// we will just use it as a fallback test // we will just use it as a fallback test
// later we will be able to use it as the primary test of whether or not to relay. // later we will be able to use it as the primary test of whether or not to relay.
@ -259,6 +264,13 @@ function notifier_run($argv, $argc){
$deny_people = expand_acl($parent['deny_cid']); $deny_people = expand_acl($parent['deny_cid']);
$deny_groups = expand_groups(expand_acl($parent['deny_gid'])); $deny_groups = expand_groups(expand_acl($parent['deny_gid']));
// if our parent is a forum, uplink to the origonal author causing
// a delivery fork
if(intval($parent['forum_mode']) && (! $top_level) && ($cmd !== 'uplink')) {
proc_run('php','include/notifier','uplink',$item_id);
}
$conversants = array(); $conversants = array();
foreach($items as $item) { foreach($items as $item) {