aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xinclude/diaspora.php5
-rw-r--r--include/notifier.php2
-rw-r--r--version.inc2
3 files changed, 8 insertions, 1 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 b82fb41cc..46f9eb1de 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -412,6 +412,8 @@ function notifier_run($argv, $argc){
: false
);
+
+
$uplink = false;
// $cmd === 'relay' indicates the owner is sending it to the original recipients
diff --git a/version.inc b/version.inc
index 20fd10ffb..2dbf2a1b8 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-05-25.1043
+2015-05-27.1045