lcase tname

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

diff --git a/actions/showstream.php b/actions/showstream.php
index 8ada066b12da9aa9bac6cde486f18324b2cd00aa..8980b4de159692c37130da710069d84dfd03c76d 100644 (file)
--- 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;
                }
 
@@ -287,15 +287,15 @@ class ShowstreamAction extends StreamAction {
                                                                                                                         array('nickname' => $profile->nickname))),
                                           _('Subscriptions'));
                common_element_end('dt');
-               common_element('dd', 'subscriptions', ($subs_count) ? $subs_count : '0');
+               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) ? $subbed_count : '0');
+               common_element('dd', 'subscribers', (is_int($subbed_count)) ? $subbed_count : '0');
                common_element('dt', 'notices', _('Notices'));
-               common_element('dd', 'notices', ($notice_count) ? $notice_count : '0');
+               common_element('dd', 'notices', (is_int($notice_count)) ? $notice_count : '0');
                common_element_end('dl');
 
                common_element_end('div');
@@ -306,7 +306,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;