Bug 35034 - moved autocomment-prefix between the prefix and the arrow. Follow up...

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

diff --git a/includes/FeedUtils.php b/includes/FeedUtils.php
index ecf3ac7..d280db5 100644 (file)
--- a/includes/FeedUtils.php
+++ b/includes/FeedUtils.php
@@ -53,24 +53,21 @@ class FeedUtils {
         * @return String
         */
        public static function formatDiff( $row ) {
-               global $wgUser;
-
                $titleObj = Title::makeTitle( $row->rc_namespace, $row->rc_title );
                $timestamp = wfTimestamp( TS_MW, $row->rc_timestamp );
                $actiontext = '';
                if( $row->rc_type == RC_LOG ) {
-                       if( $row->rc_deleted & LogPage::DELETED_ACTION ) {
-                               $actiontext = wfMsgHtml('rev-deleted-event');
-                       } else {
-                               $actiontext = LogPage::actionText( $row->rc_log_type, $row->rc_log_action,
-                                       $titleObj, $wgUser->getSkin(), LogPage::extractParams($row->rc_params,true,true) );
-                       }
+                       $rcRow = (array)$row; // newFromRow() only accepts arrays for RC rows
+                       $actiontext = LogFormatter::newFromRow( $rcRow )->getActionText();
                }
                return self::formatDiffRow( $titleObj,
                        $row->rc_last_oldid, $row->rc_this_oldid,
                        $timestamp,
-                       ($row->rc_deleted & Revision::DELETED_COMMENT) ? wfMsgHtml('rev-deleted-comment') : $row->rc_comment,
-                       $actiontext );
+                       ($row->rc_deleted & Revision::DELETED_COMMENT)
+                               ? wfMsgHtml('rev-deleted-comment') 
+                               : $row->rc_comment,
+                       $actiontext 
+               );
        }
 
        /**
@@ -85,20 +82,19 @@ class FeedUtils {
         * @return String
         */
        public static function formatDiffRow( $title, $oldid, $newid, $timestamp, $comment, $actiontext='' ) {
-               global $wgFeedDiffCutoff, $wgLang, $wgUser;
+               global $wgFeedDiffCutoff, $wgLang;
                wfProfileIn( __METHOD__ );
 
-               $skin = $wgUser->getSkin();
                # log enties
                $completeText = '<p>' . implode( ' ',
                        array_filter(
                                array(
                                        $actiontext,
-                                       $skin->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.
-               //      Most feed readers will not log in anway.
+               // NOTE: Check permissions for anonymous users, not current user.
+               //       No "privileged" version should end up in the cache.
+               //       Most feed readers will not log in anway.
                $anon = new User();
                $accErrors = $title->getUserPermissionsErrors( 'read', $anon, true );
 
@@ -118,6 +114,7 @@ class FeedUtils {
                        #       $wgLang->time( $timestamp ) ),
                        #       wfMsg( 'currentrev' ) );
 
+                       $diffText = '';
                        // Don't bother generating the diff if we won't be able to show it
                        if ( $wgFeedDiffCutoff > 0 ) {
                                $de = new DifferenceEngine( $title, $oldid, $newid );
@@ -131,7 +128,7 @@ class FeedUtils {
 
                        if ( $wgFeedDiffCutoff <= 0 || ( strlen( $diffText ) > $wgFeedDiffCutoff ) ) {
                                // Omit large diffs
-                               $diffText = self::getDiffText( $title, $newid, $oldid);
+                               $diffText = self::getDiffLink( $title, $newid, $oldid );
                        } elseif ( $diffText === false ) {
                                // Error in diff engine, probably a missing revision
                                $diffText = "<p>Can't load revision $newid</p>";
@@ -150,7 +147,7 @@ class FeedUtils {
                        }
                        if ( $wgFeedDiffCutoff <= 0 || strlen( $newtext ) > $wgFeedDiffCutoff ) {
                                // Omit large new page diffs, bug 29110
-                               $diffText = self::getDiffText( $title, $newid );
+                               $diffText = self::getDiffLink( $title, $newid );
                        } else {
                                $diffText = '<p><b>' . wfMsg( 'newpage' ) . '</b></p>' .
                                        '<div>' . nl2br( htmlspecialchars( $newtext ) ) . '</div>';
@@ -169,18 +166,18 @@ class FeedUtils {
         * @param $title Title object: used to generate the diff URL
         * @param $newid Integer newid for this diff
         * @param $oldid Integer|null oldid for the diff. Null means it is a new article
+        * @return string
         */
-       protected static function getDiffText( Title $title, $newid, $oldid = null ) {
+       protected static function getDiffLink( Title $title, $newid, $oldid = null ) {
                $queryParameters = ($oldid == null)
                        ? "diff={$newid}"
                        : "diff={$newid}&oldid={$oldid}" ;
-               $diffLink = $title->escapeFullUrl( $queryParameters );
+               $diffUrl = $title->getFullUrl( $queryParameters );
 
-               $diffText = Html::RawElement( 'a', array( 'href' => $diffLink ),
-                       htmlspecialchars( wfMsgForContent( 'showdiff' ) )
-               );
+               $diffLink = Html::element( 'a', array( 'href' => $diffUrl ),
+                       wfMsgForContent( 'showdiff' ) );
 
-               return $diffText;
+               return $diffLink;
        }
 
        /**