remove unused message

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

diff --git a/includes/SpecialRecentchanges.php b/includes/SpecialRecentchanges.php
index 0c05104..97f810d 100644 (file)
--- a/includes/SpecialRecentchanges.php
+++ b/includes/SpecialRecentchanges.php
@@ -8,9 +8,7 @@
 /**
  *
  */
-require_once( 'Feed.php' );
 require_once( 'ChangesList.php' );
-require_once( 'Revision.php' );
 
 /**
  * Constructor
@@ -583,7 +581,7 @@ function rcNamespaceForm( $namespace, $invert, $nondefaults, $categories_any ) {
                $categories = trim ( $wgRequest->getVal ( 'categories' , "" ) ) ;
                $cb_arr = array( 'type' => 'checkbox', 'name' => 'categories_any', 'value' => "1" ) ;
                if ( $categories_any ) $cb_arr['checked'] = "checked" ;
-               $catbox = "<br/>" ;
+               $catbox = "<br />" ;
                $catbox .= wfMsgExt('rc_categories', array('parseinline')) . " ";
                $catbox .= wfElement('input', array( 'type' => 'text', 'name' => 'categories', 'value' => $categories));
                $catbox .= " &nbsp;" ;
@@ -614,27 +612,41 @@ function rcNamespaceForm( $namespace, $invert, $nondefaults, $categories_any ) {
  * Format a diff for the newsfeed
  */
 function rcFormatDiff( $row ) {
-       global $wgFeedDiffCutoff, $wgContLang;
+       $titleObj = Title::makeTitle( $row->rc_namespace, $row->rc_title );
+       return rcFormatDiffRow( $titleObj,
+               $row->rc_last_oldid, $row->rc_this_oldid,
+               $row->rc_timestamp,
+               $row->rc_comment );
+}
+
+function rcFormatDiffRow( $title, $oldid, $newid, $timestamp, $comment ) {
+       global $wgFeedDiffCutoff, $wgContLang, $wgUser;
        $fname = 'rcFormatDiff';
        wfProfileIn( $fname );
 
        require_once( 'DifferenceEngine.php' );
-       $completeText = '<p>' . htmlspecialchars( $row->rc_comment ) . "</p>\n";
+       $skin = $wgUser->getSkin();
+       $completeText = '<p>' . $skin->formatComment( $comment ) . "</p>\n";
 
-       if( $row->rc_namespace >= 0 ) {
-               if( $row->rc_last_oldid ) {
+       if( $title->getNamespace() >= 0 ) {
+               if( $oldid ) {
                        wfProfileIn( "$fname-dodiff" );
 
-                       $titleObj = Title::makeTitle( $row->rc_namespace, $row->rc_title );
-                       $de = new DifferenceEngine( $titleObj, $row->rc_last_oldid, $row->rc_this_oldid );
-                       $diffText = $de->getDiff( wfMsg( 'revisionasof', $wgContLang->timeanddate( $row->rc_timestamp ) ),
-                               wfMsg( 'currentrev' ) );
+                       $de = new DifferenceEngine( $title, $oldid, $newid );
+                       #$diffText = $de->getDiff( wfMsg( 'revisionasof',
+                       #       $wgContLang->timeanddate( $timestamp ) ),
+                       #       wfMsg( 'currentrev' ) );
+                       $diffText = $de->getDiff(
+                               wfMsg( 'previousrevision' ), // hack
+                               wfMsg( 'revisionasof',
+                                       $wgContLang->timeanddate( $timestamp ) ) );
+                               
 
                        if ( strlen( $diffText ) > $wgFeedDiffCutoff ) {
                                // Omit large diffs
-                               $diffLink = $titleObj->escapeFullUrl(
-                                       'diff=' . $row->rc_this_oldid .
-                                       '&oldid=' . $row->rc_last_oldid );
+                               $diffLink = $title->escapeFullUrl(
+                                       'diff=' . $newid .
+                                       '&oldid=' . $oldid );
                                $diffText = '<a href="' .
                                        $diffLink .
                                        '">' .
@@ -642,7 +654,7 @@ function rcFormatDiff( $row ) {
                                        '</a>';
                        } elseif ( $diffText === false ) {
                                // Error in diff engine, probably a missing revision
-                               $diffText = "<p>Can't load revision $row->rc_this_oldid</p>";
+                               $diffText = "<p>Can't load revision $newid</p>";
                        } else {
                                // Diff output fine, clean up any illegal UTF-8
                                $diffText = UtfNormal::cleanUp( $diffText );
@@ -650,7 +662,7 @@ function rcFormatDiff( $row ) {
                        }
                        wfProfileOut( "$fname-dodiff" );
                } else {
-                       $rev = Revision::newFromId( $row->rc_this_oldid );
+                       $rev = Revision::newFromId( $newid );
                        if( is_null( $rev ) ) {
                                $newtext = '';
                        } else {