aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xinclude/diaspora.php5
-rw-r--r--include/notifier.php11
2 files changed, 5 insertions, 11 deletions
diff --git a/include/diaspora.php b/include/diaspora.php
index b532822bf..25e0027b2 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -2400,6 +2400,11 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) {
$a = get_app();
$myaddr = $owner['channel_address'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
+ if(intval($item['id']) != intval($item['parent'])) {
+ logger('attempted to send a comment as a top-level post');
+ return;
+ }
+
$images = array();
$title = $item['title'];
diff --git a/include/notifier.php b/include/notifier.php
index c99625a57..46f9eb1de 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -430,17 +430,6 @@ function notifier_run($argv, $argc){
$uplink = true;
}
-// FIXME - make sure this is complete (the other uplink) and check before enabling
-// if((! $top_level_post) && (! $relay_to_owner) && (! $uplink) && ($cmd !== 'relay')) {
-
- // We've been asked to deliver a comment, but it isn't being sent upstream
- // and the owner isn't delivering it downstream. This is totally unexpected
- // and shouldn't happen. We will also not allow it to happen.
-
-// logger('Comment being processed with unspecific routing.');
-// return;
-// }
-
if(($relay_to_owner || $uplink) && ($cmd !== 'relay')) {
logger('notifier: followup relay', LOGGER_DEBUG);
$recipients = array(($uplink) ? $parent_item['source_xchan'] : $parent_item['owner_xchan']);