diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2011-06-22 11:28:20 +0200 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2011-06-22 11:28:20 +0200 |
| commit | 9db190c7e736ec8d063187d4241b59feaf7dc2d1 (patch) | |
| tree | 46d1a0dee7febef5c2d57a9f7b972be16a163b3d /includes/FeedUtils.php | |
| parent | 78677c7bbdcc9739f6c10c75935898a20e1acd9e (diff) | |
update to MediaWiki 1.17.0
Diffstat (limited to 'includes/FeedUtils.php')
| -rw-r--r-- | includes/FeedUtils.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/includes/FeedUtils.php b/includes/FeedUtils.php index 7e841f32..9daffc12 100644 --- a/includes/FeedUtils.php +++ b/includes/FeedUtils.php @@ -86,7 +86,7 @@ class FeedUtils { * @return String */ public static function formatDiffRow( $title, $oldid, $newid, $timestamp, $comment, $actiontext='' ) { - global $wgFeedDiffCutoff, $wgContLang, $wgUser; + global $wgFeedDiffCutoff, $wgLang, $wgUser; wfProfileIn( __METHOD__ ); $skin = $wgUser->getSkin(); @@ -108,9 +108,9 @@ class FeedUtils { wfProfileIn( __METHOD__."-dodiff" ); #$diffText = $de->getDiff( wfMsg( 'revisionasof', - # $wgContLang->timeanddate( $timestamp ), - # $wgContLang->date( $timestamp ), - # $wgContLang->time( $timestamp ) ), + # $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 @@ -119,12 +119,12 @@ class FeedUtils { $diffText = $de->getDiff( wfMsg( 'previousrevision' ), // hack wfMsg( 'revisionasof', - $wgContLang->timeanddate( $timestamp ), - $wgContLang->date( $timestamp ), - $wgContLang->time( $timestamp ) ) ); + $wgLang->timeanddate( $timestamp ), + $wgLang->date( $timestamp ), + $wgLang->time( $timestamp ) ) ); } - if ( ( strlen( $diffText ) > $wgFeedDiffCutoff ) || ( $wgFeedDiffCutoff <= 0 ) ) { + if ( $wgFeedDiffCutoff <= 0 || ( strlen( $diffText ) > $wgFeedDiffCutoff ) ) { // Omit large diffs $diffLink = $title->escapeFullUrl( 'diff=' . $newid . |