Ticket #1094 Facebook app invites page was failing if no friends had added the app yet

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

diff --git a/actions/tagother.php b/actions/tagother.php
index 9a63fc438221bf62b97f7a5874f54c1ea796040a..3e8a12fd693d3d78a3717530dee6e31ec35795b9 100644 (file)
--- 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');
@@ -142,6 +141,8 @@ class TagotherAction extends Action
         $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 +203,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');