diff options
Diffstat (limited to 'mod/item.php')
-rw-r--r-- | mod/item.php | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/mod/item.php b/mod/item.php index 5ddafb709..c9ec56eeb 100644 --- a/mod/item.php +++ b/mod/item.php @@ -430,10 +430,14 @@ function item_post(&$a) { // First figure out if it's a status post that would've been // created using tinymce. Otherwise leave it alone. - $plaintext = ((feature_enabled($profile_uid,'richtext')) ? false : true); - if((! $parent) && (! $api_source) && (! $plaintext)) { - $body = fix_mce_lf($body); - } + $plaintext = true; + +// $plaintext = ((feature_enabled($profile_uid,'richtext')) ? false : true); +// if((! $parent) && (! $api_source) && (! $plaintext)) { +// $body = fix_mce_lf($body); +// } + + // If we're sending a private top-level message with a single @-taggable channel as a recipient, @-tag it, if our pconfig is set. @@ -781,7 +785,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'], |