GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Show both empty and full notice search results inside event wrapper

This commit is contained in:
Evan Prodromou 2011-04-12 14:29:12 -04:00
parent 239d92176d
commit 606884385c
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
actions/noticesearch.php
View File

@ -132,11 +132,10 @@ class NoticesearchAction extends SearchAction
*/ */
function showResults($q, $page) function showResults($q, $page)
{ {
if (Event::handle('StartNoticeSearchShowResults', array($this, $q, $this->notice))) {
if ($this->notice->N === 0) { if ($this->notice->N === 0) {
$this->showEmptyResults($q, $page); $this->showEmptyResults($q, $page);
} } else {
if (Event::handle('StartNoticeSearchShowResults', array($this, $q, $this->notice))) {
$terms = preg_split('/[\s,]+/', $q); $terms = preg_split('/[\s,]+/', $q);
$nl = new SearchNoticeList($this->notice, $this, $terms); $nl = new SearchNoticeList($this->notice, $this, $terms);
$cnt = $nl->show(); $cnt = $nl->show();
@ -145,6 +144,7 @@ class NoticesearchAction extends SearchAction
$page, $page,
'noticesearch', 'noticesearch',
array('q' => $q)); array('q' => $q));
}
Event::handle('EndNoticeSearchShowResults', array($this, $q, $this->notice)); Event::handle('EndNoticeSearchShowResults', array($this, $q, $this->notice));
} }
} }