I had some inheritance the wrong way around.

diff --git a/actions/showstream.php b/actions/showstream.php
index 254e4f43da8fc9b8832e350819ef90241846f2bc..6eccbd06bf49db0f33db1394df1ca3f828918f63 100644 (file)
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -45,7 +45,7 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-class ShowstreamAction extends ProfileAction
+class ShowstreamAction extends NoticestreamAction
 {
     var $notice;
 

diff --git a/lib/noticestreamaction.php b/lib/noticestreamaction.php
index e064b2801d207659519d37b8e504e96f660b63ac..39c19d551f0500110f8c8d1520eb1a6233694d12 100644 (file)
--- a/lib/noticestreamaction.php
+++ b/lib/noticestreamaction.php
@@ -2,8 +2,24 @@
 
 if (!defined('GNUSOCIAL')) { exit(1); }
 
-interface NoticestreamAction
+abstract class NoticestreamAction extends ProfileAction
 {
+
+    protected function prepare(array $args=array()) {
+        parent::prepare($args);
+
+        // fetch the actual stream stuff
+        $stream = $this->getStream();
+        $this->notice = $stream->getNotices(($this->page-1) * NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
+
+        if ($this->page > 1 && $this->notice->N == 0) {
+            // TRANS: Client error when page not found (404).
+            $this->clientError(_('No such page.'), 404);
+        }
+
+        return true;
+    }
+
     // this fetches the NoticeStream
-    public function getStream();
+    abstract public function getStream();
 }

diff --git a/lib/profileaction.php b/lib/profileaction.php
index 7161f0d4a3b90eb08af9f95ef928d5ae823ea6bb..d98bcd7f7433387a45715ab706bfda5b4a1115a0 100644 (file)
--- a/lib/profileaction.php
+++ b/lib/profileaction.php
@@ -41,7 +41,7 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-abstract class ProfileAction extends ManagedAction implements NoticestreamAction
+abstract class ProfileAction extends ManagedAction
 {
     var $page    = null;
     var $tag     = null;
@@ -65,16 +65,6 @@ abstract class ProfileAction extends ManagedAction implements NoticestreamAction
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
         common_set_returnto($this->selfUrl());
 
-        // fetch the actual stream stuff
-        $stream = $this->getStream();
-        $this->notice = $stream->getNotices(($this->page-1) * NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
-
-        if ($this->page > 1 && $this->notice->N == 0) {
-            // TRANS: Client error when page not found (404).
-            $this->clientError(_('No such page.'), 404);
-        }
-
-
         return true;
     }