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

1 files changed, 10 insertions, 5 deletions

diff --git a/actions/tag.php b/actions/tag.php
index ee9617b66..7c6f99d92 100644
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -49,7 +49,7 @@ class TagAction extends Action
 
         if($this->page > 1 && $this->notice->N == 0){
             // TRANS: Server error when page not found (404)
-            $this->serverError(_('No such page'),$code=404);
+            $this->serverError(_('No such page.'),$code=404);
         }
 
         return true;
@@ -102,12 +102,17 @@ class TagAction extends Action
 
     function showContent()
     {
-        $nl = new NoticeList($this->notice, $this);
+        if(Event::handle('StartTagShowContent', array($this))) {
+            
+            $nl = new NoticeList($this->notice, $this);
 
-        $cnt = $nl->show();
+            $cnt = $nl->show();
 
-        $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
-                          $this->page, 'tag', array('tag' => $this->tag));
+            $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
+                              $this->page, 'tag', array('tag' => $this->tag));
+
+            Event::handle('EndTagShowContent', array($this));
+        }
     }
 
     function isReadOnly($args)