X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fpublic.php;h=43beaffc6a6074790fbc42e186f0eeb099afb026;hb=74291968c4b4f1fca29cb79caad695a1e2360734;hp=d2285fb8fcce57a1896dc9302822e2403ed61ee6;hpb=5f79bcdf51e0cbc17f62c6899207813f26a29214;p=quix0rs-gnu-social.git

diff --git a/actions/public.php b/actions/public.php
index d2285fb8fc..43beaffc6a 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -59,29 +59,18 @@ class PublicAction extends StreamAction {
 
 	function show_notices($page) {
 
-		$notice = new Notice();
-
-		# XXX: sub-optimal
-
-		$notice->is_local = 1;
-
-		$notice->orderBy('created DESC, notice.id DESC');
-
-		# We fetch one extra, to see if we need an "older" link
-
-		$notice->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
-
-		$cnt = $notice->find();
-
-		if ($cnt > 0) {
+		$cnt = 0;
+		$notice = Notice::publicStream(($page-1)*NOTICES_PER_PAGE,
+									   NOTICES_PER_PAGE + 1);
+		
+		if ($notice) {
 			common_element_start('ul', array('id' => 'notices'));
-			for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) {
-				if ($notice->fetch()) {
-					$this->show_notice($notice);
-				} else {
-					// shouldn't happen!
+			while ($notice->fetch()) {
+				$cnt++;
+				if ($cnt > NOTICES_PER_PAGE) {
 					break;
 				}
+				$this->show_notice($notice);
 			}
 			common_element_end('ul');
 		}
@@ -89,5 +78,4 @@ class PublicAction extends StreamAction {
 		common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
 						  $page, 'public');
 	}
-}
-
+}
\ No newline at end of file