harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

notification being sent for comments from blocked connections on same site.

Browse Source
This commit is contained in:
friendica 2014-06-26 16:24:53 -07:00
parent 6d891fbb9d
commit 8b545d91db
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/items.php
View File

@ -3603,6 +3603,7 @@ function drop_items($items) {
function drop_item($id,$interactive = true,$stage = DROPITEM_NORMAL) { function drop_item($id,$interactive = true,$stage = DROPITEM_NORMAL) {
$a = get_app(); $a = get_app();
// locate item to be deleted // locate item to be deleted

6
mod/item.php
View File

@ -781,7 +781,11 @@ function item_post(&$a) {
logger('mod_item: saved item ' . $post_id); logger('mod_item: saved item ' . $post_id);
if($parent) { 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( notification(array(
'type' => NOTIFY_COMMENT, 'type' => NOTIFY_COMMENT,
'from_xchan' => $datarray['author_xchan'], 'from_xchan' => $datarray['author_xchan'],

2
version.inc
View File

@ -1 +1 @@
2014-06-25.717 2014-06-26.718