lcase tname

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

diff --git a/actions/all.php b/actions/all.php
index 6ece53528a45bad582b0852f4c66a1ced4fc7ea7..20aea766868552348f4b275a84bd29642a85dccb 100644 (file)
--- a/actions/all.php
+++ b/actions/all.php
@@ -31,14 +31,14 @@ class AllAction extends StreamAction {
                $user = User::staticGet('nickname', $nickname);
 
                if (!$user) {
-                       $this->client_error(sprintf(_('No such user: %s'), $nickname));
+                       $this->client_error(_('No such user.'));
                        return;
                }
 
                $profile = $user->getProfile();
 
                if (!$profile) {
-                       common_server_error(_('User record exists without profile.'));
+                       common_server_error(_('User has no profile.'));
                        return;
                }
 
@@ -80,7 +80,7 @@ class AllAction extends StreamAction {
                $notice->whereAdd('EXISTS (SELECT subscribed from subscription where subscriber = '.$profile->id.' and subscribed = notice.profile_id)', 'OR');
                $notice->whereAdd('profile_id = ' . $profile->id, 'OR');
 
-               $notice->orderBy('created DESC');
+               $notice->orderBy('created DESC, notice.id DESC');
 
                $page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;