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.

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';
 

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)