Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

This commit is contained in:
Evan Prodromou 2009-09-27 10:11:10 -04:00
commit f9bb35369a
2 changed files with 12 additions and 3 deletions

View File

@ -194,6 +194,12 @@ StartShowExportData: just before showing the <div> with export data (feeds)
EndShowExportData: just after showing the <div> with export data (feeds)
- $action: action object being shown
StartShowNoticeItem: just before showing the notice item
- $action: action object being shown
EndShowNoticeItem: just after showing the notice item
- $action: action object being shown
StartShowPageNotice: just before showing the page notice (instructions or error)
- $action: action object being shown

View File

@ -178,9 +178,12 @@ class NoticeListItem extends Widget
function show()
{
$this->showStart();
$this->showNotice();
$this->showNoticeInfo();
$this->showNoticeOptions();
if (Event::handle('StartShowNoticeItem', array($this))) {
$this->showNotice();
$this->showNoticeInfo();
$this->showNoticeOptions();
Event::handle('EndShowNoticeItem', array($this));
}
$this->showEnd();
}