lcase tname

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

diff --git a/actions/all.php b/actions/all.php
index c19440052f157b5e18eed24e7d7b22dc5450b947..20aea766868552348f4b275a84bd29642a85dccb 100644 (file)
--- a/actions/all.php
+++ b/actions/all.php
@@ -31,46 +31,46 @@ class AllAction extends StreamAction {
                $user = User::staticGet('nickname', $nickname);
 
                if (!$user) {
-                       $this->client_error(_t('No such user: ') . $nickname);
+                       $this->client_error(_('No such user.'));
                        return;
                }
 
                $profile = $user->getProfile();
 
                if (!$profile) {
-                       common_server_error(_t('User record exists without profile.'));
+                       common_server_error(_('User has no profile.'));
                        return;
                }
 
                # Looks like we're good; show the header
 
-               common_show_header($profile->nickname . _t(" and friends"),
+               common_show_header(sprintf(_("%s and friends"), $profile->nickname),
                                                   array($this, 'show_header'), $user,
                                                   array($this, 'show_top'));
-               
+
                $this->show_notices($profile);
-               
+
                common_show_footer();
        }
-       
+
        function show_header($user) {
                common_element('link', array('rel' => 'alternate',
                                                                         'href' => common_local_url('allrss', array('nickname' =>
                                                                                                                                                           $user->nickname)),
                                                                         'type' => 'application/rss+xml',
-                                                                        'title' => _t('Feed for friends of ') . $user->nickname));
+                                                                        'title' => sprintf(_('Feed for friends of %s'), $user->nickname)));
        }
 
        function show_top($user) {
                $cur = common_current_user();
-               
+
                if ($cur && $cur->id == $user->id) {
                        common_notice_form('all');
                }
-               
+
                $this->views_menu();
        }
-       
+
        function show_notices($profile) {
 
                $notice = DB_DataObject::factory('notice');
@@ -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;
 
@@ -100,7 +100,7 @@ class AllAction extends StreamAction {
                        }
                        common_element_end('ul');
                }
-               
+
                common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
                                                  $page, 'all', array('nickname' => $profile->nickname));
        }