IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Correct className for notification avatars using system avatar (#25578)

Browse Source
This commit is contained in:
Mark VanLandingham 2024-02-06 14:47:35 -06:00 committed by GitHub
parent 090252bc39
commit 13186e6790
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/discourse/app/lib/user-menu/base-item.js
View File

@ -42,11 +42,18 @@ export default class UserMenuBaseItem {
} }
get iconComponentArgs() { get iconComponentArgs() {
// Use endsWith to determine if the avatarTemplate is the system avatar, because locally the
// system avatar is a relative path and doesn't contain hostname. Exact matches will also
// evaluate to true.
const usingSystemAvatar =
!this.avatarTemplate ||
this.avatarTemplate.endsWith(this.site.system_user_avatar_template);
return { return {
avatarTemplate: avatarTemplate:
this.avatarTemplate || this.site.system_user_avatar_template, this.avatarTemplate || this.site.system_user_avatar_template,
icon: this.icon, icon: this.icon,
classNames: this.avatarTemplate ? "user-avatar" : "system-avatar", classNames: usingSystemAvatar ? "system-avatar" : "user-avatar",
}; };
} }