Merge pull request #11363 from nextcloud/backport/11360/stable28

[stable28] fix(avatar): Fix avatars without PHP intl module
nextcloud · Jan 10, 2024 · db5ea53 · db5ea53
2 parents 78283ff + 294a293
commit db5ea53
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/Service/AvatarService.php b/lib/Service/AvatarService.php
@@ -224,7 +224,7 @@ public function getAvatar(Room $room, ?IUser $user, bool $darkTheme = false): IS
 				}
 			}
 		}
-		if ($this->emojiHelper->isValidSingleEmoji(mb_substr($room->getName(), 0, 1))) {
+		if ($this->emojiHelper->doesPlatformSupportEmoji() && $this->emojiHelper->isValidSingleEmoji(mb_substr($room->getName(), 0, 1))) {
 			return new InMemoryFile(
 				$token,
 				$this->getEmojiAvatar(
@@ -271,7 +271,7 @@ protected function getEmojiAvatar(string $emoji, string $fillColor): string {
 	 * @return string
 	 */
 	protected function getFirstCombinedEmoji(string $roomName, int $length = 0): string {
-		if (mb_strlen($roomName) === $length) {
+		if (!$this->emojiHelper->doesPlatformSupportEmoji() || mb_strlen($roomName) === $length) {
 			return '';
 		}
 
@@ -344,7 +344,7 @@ public function getAvatarVersion(Room $room): string {
 			[$version] = explode('.', $avatarVersion);
 			return $version;
 		}
-		if ($this->emojiHelper->isValidSingleEmoji(mb_substr($room->getName(), 0, 1))) {
+		if ($this->emojiHelper->doesPlatformSupportEmoji() && $this->emojiHelper->isValidSingleEmoji(mb_substr($room->getName(), 0, 1))) {
 			return substr(md5($this->getEmojiAvatar($this->getFirstCombinedEmoji($room->getName()), self::THEMING_BRIGHT_BACKGROUND)), 0, 8);
 		}
 		$avatarPath = $this->getAvatarPath($room);