Clean up wiki ID and DB domain ID handling

[lhc/web/wiklou.git] / includes / FeedUtils.php

diff --git a/includes/FeedUtils.php b/includes/FeedUtils.php
index b058975..0def6a0 100644 (file)
--- a/includes/FeedUtils.php
+++ b/includes/FeedUtils.php
@@ -39,6 +39,7 @@ class FeedUtils {
                global $wgRequest, $wgUser;
 
                $purge = $wgRequest->getVal( 'action' ) === 'purge';
+               // Allow users with 'purge' right to clear feed caches
                if ( $purge && $wgUser->isAllowed( 'purge' ) ) {
                        $cache = ObjectCache::getMainWANInstance();
                        $cache->delete( $timekey, 1 );
@@ -71,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 ) {
@@ -87,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
                );
        }
@@ -111,9 +115,9 @@ class FeedUtils {
                // log entries
                $completeText = '<p>' . implode( ' ',
                        array_filter(
-                               array(
+                               [
                                        $actiontext,
-                                       Linker::formatComment( $comment ) ) ) ) . "</p>\n";
+                                       Linker::formatComment( $comment ) ] ) ) . "</p>\n";
 
                // NOTE: Check permissions for anonymous users, not current user.
                //       No "privileged" version should end up in the cache.
@@ -128,13 +132,6 @@ class FeedUtils {
                }
 
                if ( $oldid ) {
-
-                       # $diffText = $de->getDiff( wfMessage( 'revisionasof',
-                       #       $wgLang->timeanddate( $timestamp ),
-                       #       $wgLang->date( $timestamp ),
-                       #       $wgLang->time( $timestamp ) )->text(),
-                       #       wfMessage( 'currentrev' )->text() );
-
                        $diffText = '';
                        // Don't bother generating the diff if we won't be able to show it
                        if ( $wgFeedDiffCutoff > 0 ) {
@@ -194,8 +191,7 @@ class FeedUtils {
                        }
 
                        if ( $html === null ) {
-
-                               // Omit large new page diffs, bug 29110
+                               // Omit large new page diffs, T31110
                                // Also use diff link for non-textual content
                                $diffText = self::getDiffLink( $title, $newid );
                        } else {
@@ -218,13 +214,13 @@ class FeedUtils {
         * @return string
         */
        protected static function getDiffLink( Title $title, $newid, $oldid = null ) {
-               $queryParameters = array( 'diff' => $newid );
+               $queryParameters = [ 'diff' => $newid ];
                if ( $oldid != null ) {
                        $queryParameters['oldid'] = $oldid;
                }
                $diffUrl = $title->getFullURL( $queryParameters );
 
-               $diffLink = Html::element( 'a', array( 'href' => $diffUrl ),
+               $diffLink = Html::element( 'a', [ 'href' => $diffUrl ],
                        wfMessage( 'showdiff' )->inContentLanguage()->text() );
 
                return $diffLink;
@@ -239,7 +235,7 @@ class FeedUtils {
         * @return string Modified HTML
         */
        public static function applyDiffStyle( $text ) {
-               $styles = array(
+               $styles = [
                        'diff'             => 'background-color: white; color:black;',
                        'diff-otitle'      => 'background-color: white; color:black; text-align: center;',
                        'diff-ntitle'      => 'background-color: white; color:black; text-align: center;',
@@ -253,7 +249,7 @@ class FeedUtils {
                                . 'border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; '
                                . 'border-color: #e6e6e6; vertical-align: top; white-space: pre-wrap;',
                        'diffchange'       => 'font-weight: bold; text-decoration: none;',
-               );
+               ];
 
                foreach ( $styles as $class => $style ) {
                        $text = preg_replace( "/(<[^>]+)class=(['\"])$class\\2([^>]*>)/",