Merge remote-tracking branch 'upstream/nightly' into nightly

This commit is contained in:
www-data 2016-06-23 01:33:15 +02:00
commit b83ff3f924

View File

@ -215,7 +215,7 @@ class ShowstreamAction extends NoticestreamAction
function showNotices() function showNotices()
{ {
$pnl = new NoticeList($this->notice, $this); $pnl = new PrimaryNoticeList($this->notice, $this);
$cnt = $pnl->show(); $cnt = $pnl->show();
if (0 == $cnt) { if (0 == $cnt) {
$this->showEmptyListMessage(); $this->showEmptyListMessage();