X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2FFeedUtils.php;h=0def6a04025fe6e1a37ed4d7f9b84998b96f6091;hp=3268291b51fc0d6c9946fe3230598fb92576cb79;hb=da4a98830bf715bdc7bac38d61dc5ec401d99285;hpb=4c5e3357f16be0d2e05bbd27d6cdcae148581b8b

diff --git a/includes/FeedUtils.php b/includes/FeedUtils.php
index 3268291b51..0def6a0402 100644
--- a/includes/FeedUtils.php
+++ b/includes/FeedUtils.php
@@ -72,7 +72,8 @@ class FeedUtils {
 	/**
 	 * Format a diff for the newsfeed
 	 *
-	 * @param object $row Row from the recentchanges table
+	 * @param object $row Row from the recentchanges table, including fields as
+	 *  appropriate for CommentStore
 	 * @return string
 	 */
 	public static function formatDiff( $row ) {
@@ -88,7 +89,9 @@ class FeedUtils {
 			$timestamp,
 			$row->rc_deleted & Revision::DELETED_COMMENT
 				? wfMessage( 'rev-deleted-comment' )->escaped()
-				: $row->rc_comment,
+				: CommentStore::newKey( 'rc_comment' )
+					// Legacy from RecentChange::selectFields() via ChangesListSpecialPage::doMainQuery()
+					->getCommentLegacy( wfGetDB( DB_REPLICA ), $row )->text,
 			$actiontext
 		);
 	}
@@ -188,7 +191,6 @@ class FeedUtils {
 			}
 
 			if ( $html === null ) {
-
 				// Omit large new page diffs, T31110
 				// Also use diff link for non-textual content
 				$diffText = self::getDiffLink( $title, $newid );