X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fpublic.php;h=f99215dadbdd8aec3759aa37ac53d7d67e9d9b28;hb=803bdff3f67cce50931ce75dd209883a93a20bd3;hp=23d9f039788749d2b45a9528fc3d9f1b8a8464f8;hpb=50c7e4c722a39582c185eafe452f0b321dd39e7e;p=quix0rs-gnu-social.git

diff --git a/actions/public.php b/actions/public.php
index 23d9f03978..f99215dadb 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -29,9 +29,9 @@ class PublicAction extends StreamAction {
 		$page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
 		header('X-XRDS-Location: '. common_local_url('publicxrds'));
-		
-		common_show_header(_t('Public timeline'), 
-						   array($this, 'show_header'), NULL,  
+
+		common_show_header(_('Public timeline'),
+						   array($this, 'show_header'), NULL,
 						   array($this, 'show_top'));
 
 		# XXX: Public sidebar here?
@@ -46,36 +46,39 @@ class PublicAction extends StreamAction {
 			common_notice_form('public');
 		}
 	}
-	
+
 	function show_header() {
 		common_element('link', array('rel' => 'alternate',
 									 'href' => common_local_url('publicrss'),
 									 'type' => 'application/rss+xml',
-									 'title' => _t('Public Stream Feed')));
+									 'title' => _('Public Stream Feed')));
 		# for client side of OpenID authentication
 		common_element('meta', array('http-equiv' => 'X-XRDS-Location',
 									 'content' => common_local_url('publicxrds')));
 	}
-	
+
 	function show_notices($page) {
 
-		$notice = DB_DataObject::factory('notice');
+		$notice = new Notice();
+
+		# XXX: sub-optimal
 
-		# FIXME: bad performance
-		
-		$notice->whereAdd('EXISTS (SELECT user.id from user where user.id = notice.profile_id)');
+		if (common_config('public', 'localonly')) {
+			$notice->is_local = 1;
+		}
+
+		$notice->orderBy('created DESC, notice.id DESC');
 
-		$notice->orderBy('created 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) {
 			common_element_start('ul', array('id' => 'notices'));
-			for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) {
+            $iMax = min($cnt, NOTICES_PER_PAGE);
+			for ($i = 0; $i < $iMax; $i++) {
 				if ($notice->fetch()) {
 					$this->show_notice($notice);
 				} else {
@@ -85,7 +88,7 @@ class PublicAction extends StreamAction {
 			}
 			common_element_end('ul');
 		}
-		
+
 		common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
 						  $page, 'public');
 	}