X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fjsonsearchresultslist.php;h=357ab9be5d0ac50ab35f4673d6c1df4286c3369b;hb=33e2f5b449d477e55bda7029f9e826d889e41eb5;hp=c9b2705991f91e262f9ce53690f97e45c28d6754;hpb=b4dbd23ed21fdd530ece52011403e49e762e365d;p=quix0rs-gnu-social.git diff --git a/lib/jsonsearchresultslist.php b/lib/jsonsearchresultslist.php index c9b2705991..357ab9be5d 100644 --- a/lib/jsonsearchresultslist.php +++ b/lib/jsonsearchresultslist.php @@ -217,7 +217,7 @@ class ResultItem $replier_profile = null; if ($this->notice->reply_to) { - $reply = Notice::staticGet(intval($this->notice->reply_to)); + $reply = Notice::getKV(intval($this->notice->reply_to)); if ($reply) { $replier_profile = $reply->getProfile(); } @@ -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); } @@ -273,7 +263,7 @@ class ResultItem case 'api': break; default: - $ns = Notice_source::staticGet($source); + $ns = Notice_source::getKV($source); if ($ns) { $source_name = '' . $ns->name . ''; }