diff options
| author | Simon <simon@kisikew.org> | 2012-02-25 18:01:09 -0800 |
|---|---|---|
| committer | Simon <simon@kisikew.org> | 2012-02-25 18:01:09 -0800 |
| commit | 896f97b31ab5040e05e09de349c2b8b3d86af710 (patch) | |
| tree | e614e670a15db43be8ed790b85fdfc917885f392 /include/items.php | |
| parent | 9b6afc2a38cc00d3fabfbb90277665df820c05a6 (diff) | |
| parent | f3a225437b4690e0d02c773600d29837674660d7 (diff) | |
| download | volse-hubzilla-896f97b31ab5040e05e09de349c2b8b3d86af710.tar.gz volse-hubzilla-896f97b31ab5040e05e09de349c2b8b3d86af710.tar.bz2 volse-hubzilla-896f97b31ab5040e05e09de349c2b8b3d86af710.zip | |
Merge pull request #48 from abinoam/thmail-5
Comment Notifications by Email - Threading Them
Diffstat (limited to 'include/items.php')
| -rwxr-xr-x | include/items.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/items.php b/include/items.php index de3ade6b4..c461b83b4 100755 --- a/include/items.php +++ b/include/items.php @@ -2223,7 +2223,8 @@ function local_delivery($importer,$data) { 'source_photo' => ((link_compare($datarray['author-link'],$importer['url'])) ? $importer['thumb'] : $datarray['author-avatar']), 'verb' => ACTIVITY_POST, - 'otype' => 'item' + 'otype' => 'item', + 'parent' => $parent, )); @@ -2317,7 +2318,7 @@ function local_delivery($importer,$data) { if($datarray['type'] != 'activity') { - $myconv = q("SELECT `author-link`, `author-avatar` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ", + $myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ", dbesc($parent_uri), intval($importer['importer_uid']) ); @@ -2330,6 +2331,8 @@ function local_delivery($importer,$data) { continue; require_once('include/enotify.php'); + + $conv_parent = $conv['parent']; notification(array( 'type' => NOTIFY_COMMENT, @@ -2345,7 +2348,8 @@ function local_delivery($importer,$data) { 'source_photo' => ((link_compare($datarray['author-link'],$importer['url'])) ? $importer['thumb'] : $datarray['author-avatar']), 'verb' => ACTIVITY_POST, - 'otype' => 'item' + 'otype' => 'item', + 'parent' => $conv_parent, )); |