dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Remove return bool from MysqlUpdater::doInterwikiUpdate"
[lhc/web/wiklou.git]
/
includes
/
FeedUtils.php
diff --git
a/includes/FeedUtils.php
b/includes/FeedUtils.php
index
96a88d3
..
0def6a0
100644
(file)
--- a/
includes/FeedUtils.php
+++ b/
includes/FeedUtils.php
@@
-72,7
+72,8
@@
class FeedUtils {
/**
* Format a diff for the newsfeed
*
/**
* 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 ) {
* @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()
$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
);
}
$actiontext
);
}