base class is_readonly() now returns false by default

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

diff --git a/actions/showstream.php b/actions/showstream.php
index bd64a7be4af48b813363ea2789270bfe2d01222b..c05e30c39255aab606fdb571d1634d6743268006 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;
                }
 
@@ -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;
@@ -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;