diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-11-21 13:52:15 +0100 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-11-21 13:52:15 +0100 |
| commit | cb05e677a96e1312263c0a1c63ee10cea62268b1 (patch) | |
| tree | 9234db8ab0c946ed65123181acba0df71524a8eb /include/notifier.php | |
| parent | a86fd26bd86945fe75b7220e149b8986f88feb01 (diff) | |
| parent | aaedac8f574278fba89cd11d3d8f1adaeb6b030e (diff) | |
| download | volse-hubzilla-cb05e677a96e1312263c0a1c63ee10cea62268b1.tar.gz volse-hubzilla-cb05e677a96e1312263c0a1c63ee10cea62268b1.tar.bz2 volse-hubzilla-cb05e677a96e1312263c0a1c63ee10cea62268b1.zip | |
Merge remote-tracking branch 'friendica/master'
Diffstat (limited to 'include/notifier.php')
| -rw-r--r-- | include/notifier.php | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/notifier.php b/include/notifier.php index a4fe9b71e..c81ca2d15 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -218,6 +218,11 @@ function notifier_run($argv, $argc){ $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 // 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. @@ -259,6 +264,13 @@ function notifier_run($argv, $argc){ $deny_people = expand_acl($parent['deny_cid']); $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(); foreach($items as $item) { |