Merge remote branch 'cvollick/userTagPagination' into 0.8.x
This commit is contained in:
commit
0d72456a84
@ -380,8 +380,13 @@ class ShowstreamAction extends ProfileAction
|
|||||||
$this->showEmptyListMessage();
|
$this->showEmptyListMessage();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$args = array('nickname' => $this->user->nickname);
|
||||||
|
if (!empty($this->tag))
|
||||||
|
{
|
||||||
|
$args['tag'] = $this->tag;
|
||||||
|
}
|
||||||
$this->pagination($this->page>1, $cnt>NOTICES_PER_PAGE, $this->page,
|
$this->pagination($this->page>1, $cnt>NOTICES_PER_PAGE, $this->page,
|
||||||
'showstream', array('nickname' => $this->user->nickname));
|
'showstream', $args);
|
||||||
}
|
}
|
||||||
|
|
||||||
function showAnonymousMessage()
|
function showAnonymousMessage()
|
||||||
|
Loading…
Reference in New Issue
Block a user