From d9022f63880ce039446fba8364f68e656b7bf4cb Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 3 May 2012 13:01:35 +0200 Subject: Update to MediaWiki 1.19.0 --- includes/FeedUtils.php | 151 +++++++++++++++++++++++++++---------------------- 1 file changed, 84 insertions(+), 67 deletions(-) (limited to 'includes/FeedUtils.php') diff --git a/includes/FeedUtils.php b/includes/FeedUtils.php index 4502c3a8..cf42329b 100644 --- a/includes/FeedUtils.php +++ b/includes/FeedUtils.php @@ -31,16 +31,15 @@ class FeedUtils { * @return Boolean */ public static function checkFeedOutput( $type ) { - global $wgFeed, $wgFeedClasses; + global $wgOut, $wgFeed, $wgFeedClasses; if ( !$wgFeed ) { - global $wgOut; $wgOut->addWikiMsg( 'feed-unavailable' ); return false; } if( !isset( $wgFeedClasses[$type] ) ) { - wfHttpError( 500, "Internal Server Error", "Unsupported feed type." ); + $wgOut->addWikiMsg( 'feed-invalid' ); return false; } @@ -54,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 + ); } /** @@ -86,80 +82,102 @@ 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 = '

' . implode( ' ', array_filter( array( $actiontext, - $skin->formatComment( $comment ) ) ) ) . "

\n"; + Linker::formatComment( $comment ) ) ) ) . "

\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 ); - if( $title->getNamespace() >= 0 && !$accErrors && $newid ) { - if( $oldid ) { - wfProfileIn( __METHOD__."-dodiff" ); - - #$diffText = $de->getDiff( wfMsg( 'revisionasof', - # $wgLang->timeanddate( $timestamp ), - # $wgLang->date( $timestamp ), - # $wgLang->time( $timestamp ) ), - # wfMsg( 'currentrev' ) ); - - // Don't bother generating the diff if we won't be able to show it - if ( $wgFeedDiffCutoff > 0 ) { - $de = new DifferenceEngine( $title, $oldid, $newid ); - $diffText = $de->getDiff( - wfMsg( 'previousrevision' ), // hack - wfMsg( 'revisionasof', - $wgLang->timeanddate( $timestamp ), - $wgLang->date( $timestamp ), - $wgLang->time( $timestamp ) ) ); - } - - if ( $wgFeedDiffCutoff <= 0 || ( strlen( $diffText ) > $wgFeedDiffCutoff ) ) { - // Omit large diffs - $diffLink = $title->escapeFullUrl( - 'diff=' . $newid . - '&oldid=' . $oldid ); - $diffText = '' . - htmlspecialchars( wfMsgForContent( 'showdiff' ) ) . - ''; - } elseif ( $diffText === false ) { - // Error in diff engine, probably a missing revision - $diffText = "

Can't load revision $newid

"; - } else { - // Diff output fine, clean up any illegal UTF-8 - $diffText = UtfNormal::cleanUp( $diffText ); - $diffText = self::applyDiffStyle( $diffText ); - } - wfProfileOut( __METHOD__."-dodiff" ); + // Can't diff special pages, unreadable pages or pages with no new revision + // to compare against: just return the text. + if( $title->getNamespace() < 0 || $accErrors || !$newid ) { + wfProfileOut( __METHOD__ ); + return $completeText; + } + + if( $oldid ) { + wfProfileIn( __METHOD__."-dodiff" ); + + #$diffText = $de->getDiff( wfMsg( 'revisionasof', + # $wgLang->timeanddate( $timestamp ), + # $wgLang->date( $timestamp ), + # $wgLang->time( $timestamp ) ), + # wfMsg( 'currentrev' ) ); + + // Don't bother generating the diff if we won't be able to show it + if ( $wgFeedDiffCutoff > 0 ) { + $de = new DifferenceEngine( $title, $oldid, $newid ); + $diffText = $de->getDiff( + wfMsg( 'previousrevision' ), // hack + wfMsg( 'revisionasof', + $wgLang->timeanddate( $timestamp ), + $wgLang->date( $timestamp ), + $wgLang->time( $timestamp ) ) ); + } + + if ( $wgFeedDiffCutoff <= 0 || ( strlen( $diffText ) > $wgFeedDiffCutoff ) ) { + // Omit large diffs + $diffText = self::getDiffLink( $title, $newid, $oldid ); + } elseif ( $diffText === false ) { + // Error in diff engine, probably a missing revision + $diffText = "

Can't load revision $newid

"; + } else { + // Diff output fine, clean up any illegal UTF-8 + $diffText = UtfNormal::cleanUp( $diffText ); + $diffText = self::applyDiffStyle( $diffText ); + } + wfProfileOut( __METHOD__."-dodiff" ); + } else { + $rev = Revision::newFromId( $newid ); + if( $wgFeedDiffCutoff <= 0 || is_null( $rev ) ) { + $newtext = ''; + } else { + $newtext = $rev->getText(); + } + if ( $wgFeedDiffCutoff <= 0 || strlen( $newtext ) > $wgFeedDiffCutoff ) { + // Omit large new page diffs, bug 29110 + $diffText = self::getDiffLink( $title, $newid ); } else { - $rev = Revision::newFromId( $newid ); - if( is_null( $rev ) ) { - $newtext = ''; - } else { - $newtext = $rev->getText(); - } $diffText = '

' . wfMsg( 'newpage' ) . '

' . '
' . nl2br( htmlspecialchars( $newtext ) ) . '
'; } - $completeText .= $diffText; } + $completeText .= $diffText; wfProfileOut( __METHOD__ ); return $completeText; } + /** + * Generates a diff link. Used when the full diff is not wanted for example + * when $wgFeedDiffCutoff is 0. + * + * @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 + */ + protected static function getDiffLink( Title $title, $newid, $oldid = null ) { + $queryParameters = ($oldid == null) + ? "diff={$newid}" + : "diff={$newid}&oldid={$oldid}" ; + $diffUrl = $title->getFullUrl( $queryParameters ); + + $diffLink = Html::element( 'a', array( 'href' => $diffUrl ), + wfMsgForContent( 'showdiff' ) ); + + return $diffLink; + } + /** * Hacky application of diff styles for the feeds. * Might be 'cleaner' to use DOM or XSLT or something, @@ -167,7 +185,6 @@ class FeedUtils { * * @param $text String: diff's HTML output * @return String: modified HTML - * @private */ public static function applyDiffStyle( $text ) { $styles = array( -- cgit v1.2.2