X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Ftagother.php;h=0d18945a09e88b2e8d2cc9b2704584cc93184be1;hb=7d7d78b7f7a5065a866468c2e8b5bd536f56611a;hp=9a63fc438221bf62b97f7a5874f54c1ea796040a;hpb=135f00c51bfd71e1ecb112f6813ed12c84549621;p=quix0rs-gnu-social.git

diff --git a/actions/tagother.php b/actions/tagother.php
index 9a63fc4382..0d18945a09 100644
--- a/actions/tagother.php
+++ b/actions/tagother.php
@@ -80,7 +80,7 @@ class TagotherAction extends Action
         $this->elementStart('dl', 'entity_depiction');
         $this->element('dt', null, _('Photo'));
         $this->elementStart('dd');
-        $this->element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_PROFILE_SIZE),
+        $this->element('img', array('src' => ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE),
                                     'class' => 'photo avatar',
                                     'width' => AVATAR_PROFILE_SIZE,
                                     'height' => AVATAR_PROFILE_SIZE,
@@ -90,7 +90,6 @@ class TagotherAction extends Action
         $this->elementEnd('dd');
         $this->elementEnd('dl');
 
-
         $this->elementStart('dl', 'entity_nickname');
         $this->element('dt', null, _('Nickname'));
         $this->elementStart('dd');
@@ -111,7 +110,7 @@ class TagotherAction extends Action
         if ($this->profile->location) {
             $this->elementStart('dl', 'entity_location');
             $this->element('dt', null, _('Location'));
-            $this->element('dd', 'location', $this->profile->location);
+            $this->element('dd', 'label', $this->profile->location);
             $this->elementEnd('dl');
         }
         if ($this->profile->homepage) {
@@ -136,12 +135,15 @@ class TagotherAction extends Action
                                            'id' => 'form_tag_user',
                                            'class' => 'form_settings',
                                            'name' => 'tagother',
-                                           'action' => $this->selfUrl()));
+                                           'action' => common_local_url('tagother', array('id' => $this->profile->id))));
+
         $this->elementStart('fieldset');
         $this->element('legend', null, _('Tag user'));
         $this->hidden('token', common_session_token());
         $this->hidden('id', $this->profile->id);
 
+        $user = common_current_user();
+
         $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
         $this->input('tags', _('Tags'),
@@ -202,7 +204,7 @@ class TagotherAction extends Action
         $action = $user->isSubscribed($this->profile) ? 'subscriptions' : 'subscribers';
 
         if ($this->boolean('ajax')) {
-            $this->startHTML('text/xml');
+            $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
             $this->element('title', null, _('Tags'));
             $this->elementEnd('head');