Fixed non openid registration

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

diff --git a/actions/showstream.php b/actions/showstream.php
index 2a2d9d3b4de6d78b2f973fbfa2f8213258f1106a..bd64a7be4af48b813363ea2789270bfe2d01222b 100644 (file)
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -287,15 +287,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');
@@ -337,7 +337,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'));
@@ -375,11 +375,19 @@ class ShowstreamAction extends StreamAction {
                                                                  'href' => $noticeurl,
                                                                  'title' => common_exact_date($notice->created)),
                                           common_date_string($notice->created));
-               common_element_start('a', 
+               if ($notice->reply_to) {
+                       $replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to));
+                       common_text(' (');
+                       common_element('a', array('class' => 'inreplyto',
+                                                                         'href' => $replyurl),
+                                                  _('in reply to...'));
+                       common_text(')');
+               }
+               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');