From d5d52ef51ea208897be404d74e694d96f65cab8e Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 17 Aug 2019 20:52:16 +0200
Subject: [PATCH] Include the number of other reactions in the tooltip

---
 com.woltlab.wcf/templates/__topReaction.tpl            | 10 ++++------
 .../lib/system/reaction/ReactionHandler.class.php      |  8 ++++++--
 wcfsetup/install/lang/de.xml                           |  2 +-
 wcfsetup/install/lang/en.xml                           |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/com.woltlab.wcf/templates/__topReaction.tpl b/com.woltlab.wcf/templates/__topReaction.tpl
index 5b59d4d134..9c7e8bcce7 100644
--- a/com.woltlab.wcf/templates/__topReaction.tpl
+++ b/com.woltlab.wcf/templates/__topReaction.tpl
@@ -1,18 +1,16 @@
 {assign var='topReaction' value=$__wcf->getReactionHandler()->getTopReaction($cachedReactions)}
 {if $topReaction}
-	{if $render === 'icon'}
-		<span class="jsTooltip" title="{lang reaction=$topReaction[reaction] count=$topReaction[count]}wcf.like.reaction.topReaction{/lang}">{@$topReaction[reaction]->renderIcon()}</span>
-	{elseif $render === 'tiny'}
-		<span class="topReactionTiny jsTooltip" title="{lang reaction=$topReaction[reaction] count=$topReaction[count]}wcf.like.reaction.topReaction{/lang}">
+	{if $render === 'tiny'}
+		<span class="topReactionTiny jsTooltip" title="{lang reaction=$topReaction[reaction] count=$topReaction[count] other=$topReaction[other]}wcf.like.reaction.topReaction{/lang}">
 			{@$topReaction[reaction]->renderIcon()} {#$topReaction[count]}
 		</span>
 	{elseif $render === 'short'}
-		<span class="topReactionShort jsTooltip" title="{lang reaction=$topReaction[reaction] count=$topReaction[count]}wcf.like.reaction.topReaction{/lang}">
+		<span class="topReactionShort jsTooltip" title="{lang reaction=$topReaction[reaction] count=$topReaction[count] other=$topReaction[other]}wcf.like.reaction.topReaction{/lang}">
 			{@$topReaction[reaction]->renderIcon()} × {#$topReaction[count]}
 		</span>
 	{elseif $render === 'full'}
 		<span class="topReactionFull">
-			{@$topReaction[reaction]->renderIcon()} {lang reaction=$topReaction[reaction] count=$topReaction[count]}wcf.like.reaction.topReaction{/lang}
+			{@$topReaction[reaction]->renderIcon()} {lang reaction=$topReaction[reaction] count=$topReaction[count] other=$topReaction[other]}wcf.like.reaction.topReaction{/lang}
 		</span>
 	{/if}
 {/if}
diff --git a/wcfsetup/install/files/lib/system/reaction/ReactionHandler.class.php b/wcfsetup/install/files/lib/system/reaction/ReactionHandler.class.php
index 8ca0638674..9092605e4a 100644
--- a/wcfsetup/install/files/lib/system/reaction/ReactionHandler.class.php
+++ b/wcfsetup/install/files/lib/system/reaction/ReactionHandler.class.php
@@ -745,10 +745,14 @@ class ReactionHandler extends SingletonFactory {
 			$cachedReactions = @unserialize($cachedReactions);
 			
 			if (is_array($cachedReactions) && !empty($cachedReactions)) {
-				asort($cachedReactions, SORT_NUMERIC);
+				$allReactions = array_sum($cachedReactions);
 				
+				arsort($cachedReactions, SORT_NUMERIC);
+				
+				$count = current($cachedReactions);
 				return [
-					'count' => current($cachedReactions),
+					'count' => $count,
+					'other' => $allReactions - $count,
 					'reaction' => ReactionTypeCache::getInstance()->getReactionTypeByID(key($cachedReactions)),
 				];
 			}
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 76979fceb2..45db8f9dfe 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -3983,7 +3983,7 @@ Dateianhänge:
 		<item name="wcf.like.reaction.label"><![CDATA[{#$reactions} Reaktion{if $reactions != 1}en{/if}]]></item>
 		<item name="wcf.like.reaction.more"><![CDATA[Weitere Reaktionen]]></item>
 		<item name="wcf.like.reaction.noMoreEntries"><![CDATA[Keine weiteren Reaktionen]]></item>
-		<item name="wcf.like.reaction.topReaction"><![CDATA[{$reaction->getTitle()} × {#$count}]]></item>
+		<item name="wcf.like.reaction.topReaction"><![CDATA[{$reaction->getTitle()} × {#$count}{if $other} und {if $other == 1}eine weitere Reaktion{else}{#$other} weitere Reaktionen{/if}{/if}]]></item>
 		<item name="wcf.like.reactionsReceived"><![CDATA[Erhaltene Reaktionen]]></item>
 		<item name="wcf.like.reactionsGiven"><![CDATA[Vergebene Reaktionen]]></item>
 	</category>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index dba55ec74e..92c3fc6fc0 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -3929,7 +3929,7 @@ Attachments:
 		<item name="wcf.like.reaction.label"><![CDATA[{#$reactions} reaction{if $reactions != 1}s{/if}]]></item>
 		<item name="wcf.like.reaction.more"><![CDATA[More Reactions]]></item>
 		<item name="wcf.like.reaction.noMoreEntries"><![CDATA[There are no new reactions at the moment.]]></item>
-		<item name="wcf.like.reaction.topReaction"><![CDATA[{$reaction->getTitle()} × {#$count}]]></item>
+		<item name="wcf.like.reaction.topReaction"><![CDATA[{$reaction->getTitle()} × {#$count}{if $other} and {if $other == 1}one other reaction{else}{#$other} other reactions{/if}{/if}]]></item>
 		<item name="wcf.like.reactionsReceived"><![CDATA[Reactions Received]]></item>
 		<item name="wcf.like.reactionsGiven"><![CDATA[Reactions Given]]></item>
 	</category>
-- 
2.20.1