diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/conversation.php | 3 | ||||
| -rw-r--r-- | include/enotify.php | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/include/conversation.php b/include/conversation.php index a615dfcc5..59624959f 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -512,9 +512,6 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { // - just loop through the items and format them minimally for display - - - //$tpl = get_markup_template('search_item.tpl'); $tpl = 'search_item.tpl'; diff --git a/include/enotify.php b/include/enotify.php index 07e660191..a2b7b67b0 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -297,9 +297,16 @@ function notification($params) { $datarray['type'] = $params['type']; $datarray['verb'] = $params['verb']; $datarray['otype'] = $params['otype']; + $datarray['abort'] = false; call_hooks('enotify_store', $datarray); + if($datarray['abort']) { + pop_lang(); + return; + } + + // create notification entry in DB $r = q("insert into notify (hash,name,url,photo,date,uid,link,parent,type,verb,otype) |