X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fshowstream.php;h=c05e30c39255aab606fdb571d1634d6743268006;hb=7e6870db914d4e905fc7ae833b69404fd3ea0d3d;hp=d1d040a276d5db5930942d555c86f865c3df0d68;hpb=4d65b99c68fee83fe461b9d8d6db86a844f2a431;p=quix0rs-gnu-social.git

diff --git a/actions/showstream.php b/actions/showstream.php
index d1d040a276..c05e30c392 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -41,7 +41,7 @@ class ShowstreamAction extends StreamAction {
 		$profile = $user->getProfile();
 
 		if (!$profile) {
-			common_server_error(_('User record exists without profile.'));
+			common_server_error(_('User has no profile.'));
 			return;
 		}
 
@@ -89,6 +89,11 @@ class ShowstreamAction extends StreamAction {
 		common_element('meta', array('http-equiv' => 'X-XRDS-Location',
 									 'content' => common_local_url('xrds', array('nickname' =>
 																			   $user->nickname))));
+		$profile = $user->getProfile();
+		if ($profile->bio) {
+			common_element('meta', array('name' => 'description',
+										 'content' => $profile->bio));
+		}
 	}
 
 	function no_such_user() {
@@ -150,7 +155,8 @@ class ShowstreamAction extends StreamAction {
 		}
 		if ($profile->homepage) {
 			common_element_start('p', 'website');
-			common_element('a', array('href' => $profile->homepage),
+			common_element('a', array('href' => $profile->homepage,
+									  'rel' => 'me'),
 						   $profile->homepage);
 			common_element_end('p');
 		}
@@ -199,6 +205,8 @@ class ShowstreamAction extends StreamAction {
 
 		$subs = DB_DataObject::factory('subscription');
 		$subs->subscriber = $profile->id;
+		$subs->whereAdd('subscribed != ' . $profile->id);
+		
 		$subs->orderBy('created DESC');
 
 		# We ask for an extra one to know if we need to do another page
@@ -263,11 +271,11 @@ class ShowstreamAction extends StreamAction {
 		// XXX: WORM cache this
 		$subs = DB_DataObject::factory('subscription');
 		$subs->subscriber = $profile->id;
-		$subs_count = (int) $subs->count();
+		$subs_count = (int) $subs->count() - 1;
 
 		$subbed = DB_DataObject::factory('subscription');
 		$subbed->subscribed = $profile->id;
-		$subbed_count = (int) $subbed->count();
+		$subbed_count = (int) $subbed->count() - 1;
 
 		$notices = DB_DataObject::factory('notice');
 		$notices->profile_id = $profile->id;
@@ -287,15 +295,15 @@ class ShowstreamAction extends StreamAction {
 															 array('nickname' => $profile->nickname))),
 					   _('Subscriptions'));
 		common_element_end('dt');
-		common_element('dd', 'subscriptions', $subs_count);
+		common_element('dd', 'subscriptions', (is_int($subs_count)) ? $subs_count : '0');
 		common_element_start('dt', 'subscribers');
 		common_element('a', array('href' => common_local_url('subscribers',
 															 array('nickname' => $profile->nickname))),
 					   _('Subscribers'));
 		common_element_end('dt');
-		common_element('dd', 'subscribers', $subbed_count);
+		common_element('dd', 'subscribers', (is_int($subbed_count)) ? $subbed_count : '0');
 		common_element('dt', 'notices', _('Notices'));
-		common_element('dd', 'notices', $notice_count);
+		common_element('dd', 'notices', (is_int($notice_count)) ? $notice_count : '0');
 		common_element_end('dl');
 
 		common_element_end('div');
@@ -306,7 +314,7 @@ class ShowstreamAction extends StreamAction {
 		$notice = DB_DataObject::factory('notice');
 		$notice->profile_id = $profile->id;
 
-		$notice->orderBy('created DESC');
+		$notice->orderBy('created DESC, notice.id DESC');
 
 		$page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
@@ -337,7 +345,7 @@ class ShowstreamAction extends StreamAction {
 		common_element('h2', NULL, _('Currently'));
 
 		$notice = $profile->getCurrentNotice();
-		
+
 		if ($notice) {
 			# FIXME: URL, image, video, audio
 			common_element_start('p', array('class' => 'notice_current'));
@@ -380,14 +388,14 @@ class ShowstreamAction extends StreamAction {
 			common_text(' (');
 			common_element('a', array('class' => 'inreplyto',
 									  'href' => $replyurl),
-						   _t('in reply to...'));
+						   _('in reply to...'));
 			common_text(')');
 		}
-		common_element_start('a', 
+		common_element_start('a',
 							 array('href' => common_local_url('newnotice',
 															  array('replyto' => $profile->nickname)),
 								   'onclick' => 'doreply("'.$profile->nickname.'"); return false',
-								   'title' => _t('reply'),
+								   'title' => _('reply'),
 								   'class' => 'replybutton'));
 		common_raw('→');
 		common_element_end('a');