diff options
| author | friendica <info@friendica.com> | 2014-06-26 16:24:53 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-06-26 16:24:53 -0700 |
| commit | 8b545d91db1bec0881645a989f4d7fc146397154 (patch) | |
| tree | b538faa78dff4f688672d05b61526aa4cc1e7825 | |
| parent | 6d891fbb9d5308b48d050e0a4be6394a6e826a88 (diff) | |
| download | volse-hubzilla-8b545d91db1bec0881645a989f4d7fc146397154.tar.gz volse-hubzilla-8b545d91db1bec0881645a989f4d7fc146397154.tar.bz2 volse-hubzilla-8b545d91db1bec0881645a989f4d7fc146397154.zip | |
notification being sent for comments from blocked connections on same site.
| -rwxr-xr-x | include/items.php | 1 | ||||
| -rw-r--r-- | mod/item.php | 6 | ||||
| -rw-r--r-- | version.inc | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/include/items.php b/include/items.php index b80f18b72..7fcb382b7 100755 --- a/include/items.php +++ b/include/items.php @@ -3603,6 +3603,7 @@ function drop_items($items) { function drop_item($id,$interactive = true,$stage = DROPITEM_NORMAL) { + $a = get_app(); // locate item to be deleted diff --git a/mod/item.php b/mod/item.php index 5ddafb709..693c64eca 100644 --- a/mod/item.php +++ b/mod/item.php @@ -781,7 +781,11 @@ function item_post(&$a) { logger('mod_item: saved item ' . $post_id); if($parent) { - if($datarray['owner_xchan'] != $datarray['author_xchan']) { + + // only send comment notification if this is a wall-to-wall comment, + // otherwise it will happen during delivery + + if(($datarray['owner_xchan'] != $datarray['author_xchan']) && ($parent_item['item_flags'] & ITEM_WALL)) { notification(array( 'type' => NOTIFY_COMMENT, 'from_xchan' => $datarray['author_xchan'], diff --git a/version.inc b/version.inc index 5ae7420d9..48858704d 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-06-25.717 +2014-06-26.718 |