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

[quix0rs-gnu-social.git] / actions / all.php

diff --git a/actions/all.php b/actions/all.php
index 488d00e2ba85eda3719a421ef4a209556d1d624f..8c22e6f5f076337b5829a791129369beaef2b9db 100644 (file)
--- a/actions/all.php
+++ b/actions/all.php
@@ -152,18 +152,22 @@ class AllAction extends ProfileAction
 
     function showContent()
     {
-        $nl = new NoticeList($this->notice, $this);
+        if (Event::handle('StartShowAllContent', array($this))) {
+            $nl = new NoticeList($this->notice, $this);
 
-        $cnt = $nl->show();
+            $cnt = $nl->show();
 
-        if (0 == $cnt) {
-            $this->showEmptyListMessage();
-        }
+            if (0 == $cnt) {
+                $this->showEmptyListMessage();
+            }
 
-        $this->pagination(
-            $this->page > 1, $cnt > NOTICES_PER_PAGE,
-            $this->page, 'all', array('nickname' => $this->user->nickname)
-        );
+            $this->pagination(
+                $this->page > 1, $cnt > NOTICES_PER_PAGE,
+                $this->page, 'all', array('nickname' => $this->user->nickname)
+            );
+
+            Event::handle('EndShowAllContent', array($this));
+        }
     }
 
     function showPageTitle()