Version 5.0.13

system/Content/Search/SearchContentAbstract.php

@@ -169,7 +169,22 @@ abstract class SearchContentAbstract
 		}
 
 		/* Articles language */
-		$articles = static::articlesFromIndexData( $objectClass, $containerData );
+		if( is_subclass_of( $objectClass, Comment::class ) and
+			(
+				( $itemClass::$firstCommentRequired and $indexData['index_item_index_id'] == $indexData['index_id'] ) or
+				( isset( $itemData['author'] ) )
+			)
+		)
+		{
+			/* If the first comment is required, and this is the first comment, treat it as an item, not a comment.
+			OR.... if we are commenting on someone else's content. */
+			$articles = static::articlesFromIndexData( $itemClass, $containerData );
+		}
+		else
+		{
+			$articles = static::articlesFromIndexData( $objectClass, $containerData );
+		}
+
 		$summaryLanguage = static::searchResultSummaryLanguage( $authorData, $articles, $indexData, $itemData );
 
 		/* Container details */
@@ -292,7 +307,7 @@ abstract class SearchContentAbstract
 			{
 				if( $itemClass::$firstCommentRequired )
 				{
-					if( $indexData['index_title'] )
+					if( $indexData['index_item_index_id'] == $indexData['index_id'] )
 					{
 						return Member::loggedIn()->language()->addToStack( "user_own_activity_item", FALSE, array( 'sprintf' => array( $articles['indefinite'] ), 'htmlsprintf' => array( $authorTemplate ) ) );
 					}