Introduced isCurrentProfileInScope() which shall check if current profile is

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

diff --git a/lib/jsonsearchresultslist.php b/lib/jsonsearchresultslist.php
index 7ae2b9953c0e1d63c78948d2ae101dbf5ad7cac6..0f764a72be47e32905b195f99645bbc5cac90589 100644 (file)
--- a/lib/jsonsearchresultslist.php
+++ b/lib/jsonsearchresultslist.php
@@ -232,21 +232,11 @@ class ResultItem
         $this->id           = $this->notice->id;
         $this->from_user_id = $this->profile->id;
 
-        $user = $this->profile->getUser();
-
-        if (empty($user)) {
-            // Gonna have to do till we can detect it
-            $this->iso_language_code = common_config('site', 'language');
-        } else {
-            $this->iso_language_code = $user->language;
-        }
+        $this->iso_language_code = Profile_prefs::getConfigData($this->profile, 'site', 'language');
         
         $this->source = $this->getSourceLink($this->notice->source);
 
-        $avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE);
-
-        $this->profile_image_url = ($avatar) ?
-            $avatar->displayUrl() : Avatar::defaultImage(AVATAR_STREAM_SIZE);
+        $this->profile_image_url = $this->profile->avatarUrl(AVATAR_STREAM_SIZE);
 
         $this->created_at = common_date_rfc2822($this->notice->created);
     }
@@ -274,7 +264,7 @@ class ResultItem
             break;
         default:
             $ns = Notice_source::getKV($source);
-            if ($ns) {
+            if ($ns instanceof Notice_source) {
                 $source_name = '<a href="' . $ns->url . '">' . $ns->name . '</a>';
             }
             break;