Merge branch 'mention_branch' into 'nightly'

[quix0rs-gnu-social.git] / lib / peopletagsforusersection.php

diff --git a/lib/peopletagsforusersection.php b/lib/peopletagsforusersection.php
index fef469eb8daaf096520110ebb1c42f69101a7dbb..fa5ec310330fc4dc08681a8b6c0140406609281e 100644 (file)
--- a/lib/peopletagsforusersection.php
+++ b/lib/peopletagsforusersection.php
@@ -2,7 +2,7 @@
 /**
  * StatusNet, the distributed open-source microblogging tool
  *
- * People tags a user has been tagged with
+ * Lists a user is in
  *
  * PHP version 5
  *
@@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 }
 
 /**
- * People tags a user has been tagged with
+ * List a user has is in
  *
  * @category Widget
  * @package  StatusNet
@@ -54,21 +54,22 @@ class PeopletagsForUserSection extends PeopletagSection
         $limit = PEOPLETAGS_PER_SECTION+1;
         $offset = 0;
 
-        $auth_user = common_current_user();
-        $ptags = $this->profile->getOtherTags($auth_user, $offset, $limit);
+        $ptags = $this->profile->getOtherTags(Profile::current(), $offset, $limit);
 
         return $ptags;
     }
 
     function title()
     {
-        $name = $this->profile->getBestName();
-        if ($this->profile->id == common_current_user()->id) {
-            $name = 'you';
+        $user = common_current_user();
+
+        if (!empty($user) && $this->profile->id == $user->id) {
+            // TRANS: Title for page that displays which lists current user is part of.
+            return sprintf(_('Lists with you'));
         }
-        // TRANS: Title for page that displays which people tags a user has been tagged with.
+        // TRANS: Title for page that displays which lists a user is part of.
         // TRANS: %s is a profile name.
-        return sprintf(_('People tags for %s'), $name);
+        return sprintf(_('Lists with %s'), $this->profile->getBestName());
     }
 
     function link()