Email notify-on-fave moved to Profile_prefs (run upgrade.php)

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

diff --git a/actions/apitimelinepublic.php b/actions/apitimelinepublic.php
index 47e253d5fd6124dbca30354fe747995b89a03ea2..338cd16fa093eff36a9a0c22081146ceed0cb56b 100644 (file)
--- a/actions/apitimelinepublic.php
+++ b/actions/apitimelinepublic.php
@@ -38,8 +38,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiprivateauth.php';
-
 /**
  * Returns the most recent notices (default 20) posted by everybody
  *
@@ -258,14 +256,18 @@ class ApiTimelinePublicAction extends ApiPrivateAuthAction
     {
         $notices = array();
 
-        $notice = Notice::publicStream(
-            ($this->page - 1) * $this->count, $this->count, $this->since_id,
-            $this->max_id
-        );
+        $profile = ($this->auth_user) ? $this->auth_user->getProfile() : null;
 
-        while ($notice->fetch()) {
-            $notices[] = clone($notice);
-        }
+        $stream = new PublicNoticeStream($profile);
+
+        $notice = $stream->getNotices(($this->page - 1) * $this->count,
+                                      $this->count,
+                                      $this->since_id,
+                                      $this->max_id);
+
+        $notices = $notice->fetchAll();
+
+        NoticeList::prefill($notices);
 
         return $notices;
     }