Show more links work with AJAX-retrieved HTML

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

diff --git a/lib/peopletaglist.php b/lib/peopletaglist.php
index 10ebc8cb9e3e44cbbc45718c1d5e23b88d161c52..5c027d75869f6a9b539b54377e998d16cc4d4ddc 100644 (file)
--- a/lib/peopletaglist.php
+++ b/lib/peopletaglist.php
@@ -107,7 +107,7 @@ class PeopletagListItem extends Widget
         parent::__construct($out);
         $this->peopletag  = $peopletag;
         $this->current = $current;
-        $this->profile = Profile::staticGet('id', $this->peopletag->tagger);
+        $this->profile = Profile::getKV('id', $this->peopletag->tagger);
     }
 
     /**
@@ -169,8 +169,8 @@ class PeopletagListItem extends Widget
             array('href' => common_local_url('peopletagged',
                                               array('tagger' => $this->profile->nickname,
                                                     'tag' => $this->peopletag->tag))),
-            // TRANS: Link description for link to list of users tagged with a tag.
-            _('Tagged'));
+            // TRANS: Link description for link to list of users tagged with a tag (so part of a list).
+            _('Listed'));
         $this->out->raw($this->peopletag->taggedCount());
         $this->out->elementEnd('span');
 
@@ -192,9 +192,9 @@ class PeopletagListItem extends Widget
         $this->out->element('a', array('href' =>
                     common_local_url('editpeopletag', array('tagger' => $this->profile->nickname,
                                                     'tag' => $this->peopletag->tag)),
-                                  // TRANS: Title for link to edit people tag settings.
+                                  // TRANS: Title for link to edit list settings.
                                   'title' => _('Edit list settings.')),
-                       // TRANS: Text for link to edit people tag settings.
+                       // TRANS: Text for link to edit list settings.
                        _('Edit'));
         $this->out->elementEnd('li');
     }
@@ -256,7 +256,7 @@ class PeopletagListItem extends Widget
             $this->out->elementStart('a',
                 array('href' => common_local_url('peopletagsbyuser',
                     array('nickname' => $this->profile->nickname, 'private' => 1))));
-            // TRANS: Privacy mode text in people tag list item for private tags.
+            // TRANS: Privacy mode text in list list item for private list.
             $this->out->element('span', 'privacy_mode', _m('MODE','Private'));
             $this->out->elementEnd('a');
         }
@@ -283,11 +283,9 @@ class PeopletagListItem extends Widget
 
     function showAvatar($size=AVATAR_STREAM_SIZE)
     {
-        $avatar = $this->profile->getAvatar($size);
+        $avatarUrl = $this->profile->avatarUrl($size);
 
-        $this->out->element('img', array('src' => ($avatar) ?
-                                         $avatar->displayUrl() :
-                                         Avatar::defaultImage($size),
+        $this->out->element('img', array('src' => $avatarUrl,
                                          'class' => 'avatar photo',
                                          'width' => $size,
                                          'height' => $size,