diff options
| author | friendica <info@friendica.com> | 2013-05-09 18:08:00 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-05-09 18:08:00 -0700 |
| commit | 112dbf3abd543152ad4ed3f444331ac88c1f4c46 (patch) | |
| tree | bafcc41537c25afca1ba94564ade219b06203595 /include | |
| parent | 735140e8d9f86c5ee0cbc29b50129e1abb73a647 (diff) | |
| download | volse-hubzilla-112dbf3abd543152ad4ed3f444331ac88c1f4c46.tar.gz volse-hubzilla-112dbf3abd543152ad4ed3f444331ac88c1f4c46.tar.bz2 volse-hubzilla-112dbf3abd543152ad4ed3f444331ac88c1f4c46.zip | |
get search page working with live-update and endless scroll, still not perfect - there may be duplicated content and possibly unauthorised content and 'timeago' not working correctly - will deal with those later, but at least you can see results.
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) |