Fix {{NUMBEROFADMINS}} magic word

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

diff --git a/includes/SpecialRecentchanges.php b/includes/SpecialRecentchanges.php
index a3332e8..dc3a3ad 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
@@ -497,29 +495,31 @@ function rcOptionsPanel( $defaults, $nondefaults ) {
        $options = $nondefaults + $defaults;
 
        if( $options['from'] )
-               $note = wfMsg( 'rcnotefrom', $wgLang->formatNum( $options['limit'] ), $wgLang->timeanddate( $options['from'], true ) );
+               $note = wfMsgExt( 'rcnotefrom', array( 'parseinline' ),
+                       $wgLang->formatNum( $options['limit'] ),
+                       $wgLang->timeanddate( $options['from'], true ) );
        else
-               $note = wfMsg( 'rcnote', $wgLang->formatNum( $options['limit'] ), $wgLang->formatNum( $options['days'] ), $wgLang->timeAndDate( wfTimestampNow(), true ) );
+               $note = wfMsgExt( 'rcnote', array( 'parseinline' ),
+                       $wgLang->formatNum( $options['limit'] ),
+                       $wgLang->formatNum( $options['days'] ),
+                       $wgLang->timeAndDate( wfTimestampNow(), true ) );
 
        // limit links
-       $cl = '';
        $options_limit = array(50, 100, 250, 500);
-       $i = 0;
-       while ( $i+1 < count($options_limit) ) {
-               $cl .=  makeOptionsLink( $options_limit[$i], array( 'limit' => $options_limit[$i] ), $nondefaults) . ' | ' ;
-               $i++;
+       foreach( $options_limit as $value ) {
+               $cl[] = makeOptionsLink( $wgLang->formatNum( $value ),
+                       array( 'limit' => $value ), $nondefaults) ;
        }
-       $cl .=  makeOptionsLink( $options_limit[$i], array( 'limit' => $options_limit[$i] ), $nondefaults) ;
+       $cl = implode( ' | ', $cl);
 
        // day links, reset 'from' to none
-       $dl = '';
        $options_days = array(1, 3, 7, 14, 30);
-       $i = 0;
-       while ( $i+1 < count($options_days) ) {
-               $dl .=  makeOptionsLink( $options_days[$i], array( 'days' => $options_days[$i], 'from' => '' ), $nondefaults) . ' | ' ;
-               $i++;
+       foreach( $options_days as $value ) {
+               $dl[] = makeOptionsLink( $wgLang->formatNum( $value ),
+                       array( 'days' => $value, 'from' => ''  ), $nondefaults) ;
        }
-       $dl .=  makeOptionsLink( $options_days[$i], array( 'days' => $options_days[$i], 'from' => '' ), $nondefaults) ;
+       $dl = implode( ' | ', $dl);
+
 
        // show/hide links
        $showhide = array( wfMsg( 'show' ), wfMsg( 'hide' ));
@@ -549,8 +549,9 @@ function rcOptionsPanel( $defaults, $nondefaults ) {
        $now = $wgLang->timeanddate( wfTimestampNow(), true );
        $tl =  makeOptionsLink( $now, array( 'from' => wfTimestampNow()), $nondefaults );
 
-       $rclinks = wfMsg( 'rclinks', $cl, $dl, $hl );
-       $rclistfrom = wfMsg( 'rclistfrom', $tl );
+       $rclinks = wfMsgExt( 'rclinks', array( 'parseinline', 'replaceafter'),
+               $cl, $dl, $hl );
+       $rclistfrom = wfMsgExt( 'rclistfrom', array( 'parseinline', 'replaceafter'), $tl );
        return "$note<br />$rclinks<br />$rclistfrom";
 
 }
@@ -581,11 +582,11 @@ function rcNamespaceForm( $namespace, $invert, $nondefaults, $categories_any ) {
                $cb_arr = array( 'type' => 'checkbox', 'name' => 'categories_any', 'value' => "1" ) ;
                if ( $categories_any ) $cb_arr['checked'] = "checked" ;
                $catbox = "<br/>" ;
-               $catbox .= wfMsg('rc_categories') . " ";
+               $catbox .= wfMsgExt('rc_categories', array('parseinline')) . " ";
                $catbox .= wfElement('input', array( 'type' => 'text', 'name' => 'categories', 'value' => $categories));
                $catbox .= " &nbsp;" ;
                $catbox .= wfElement('input', $cb_arr );
-               $catbox .= wfMsg('rc_categories_any');
+               $catbox .= wfMsgExt('rc_categories_any', array('parseinline'));
        } else {
                $catbox = "" ;
        }
@@ -611,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 .
                                        '">' .
@@ -639,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 );
@@ -647,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 {