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

2 files changed, 12 insertions, 3 deletions

diff --git a/EVENTS.txt b/EVENTS.txt
index fa25aabcd..74923dcc0 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -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
 
diff --git a/lib/noticelist.php b/lib/noticelist.php
index d4cd3ff6e..c2ff7c26b 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -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();
     }