Fix NS_PROJECT_TALK (bug #7792)

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

diff --git a/includes/SpecialRecentchanges.php b/includes/SpecialRecentchanges.php
index 74c6ebf..3b8d69f 100644 (file)
--- a/includes/SpecialRecentchanges.php
+++ b/includes/SpecialRecentchanges.php
@@ -8,15 +8,13 @@
 /**
  *
  */
-require_once( 'Feed.php' );
 require_once( 'ChangesList.php' );
-require_once( 'Revision.php' );
 
 /**
  * Constructor
  */
 function wfSpecialRecentchanges( $par, $specialPage ) {
-       global $wgUser, $wgOut, $wgRequest, $wgUseRCPatrol, $wgDBtype;
+       global $wgUser, $wgOut, $wgRequest, $wgUseRCPatrol;
        global $wgRCShowWatchingUsers, $wgShowUpdatedMarker;
        global $wgAllowCategorizedRecentChanges ;
        $fname = 'wfSpecialRecentchanges';
@@ -45,12 +43,10 @@ function wfSpecialRecentchanges( $par, $specialPage ) {
        extract($defaults);
 
 
-       $days = $wgUser->getOption( 'rcdays' );
-       if ( !$days ) { $days = $defaults['days']; }
+       $days = $wgUser->getOption( 'rcdays', $defaults['days']);
        $days = $wgRequest->getInt( 'days', $days );
 
-       $limit = $wgUser->getOption( 'rclimit' );
-       if ( !$limit ) { $limit = $defaults['limit']; }
+       $limit = $wgUser->getOption( 'rclimit', $defaults['limit'] );
 
        #       list( $limit, $offset ) = wfCheckLimits( 100, 'rclimit' );
        $limit = $wgRequest->getInt( 'limit', $limit );
@@ -92,7 +88,8 @@ function wfSpecialRecentchanges( $par, $specialPage ) {
                                if ( is_numeric( $bit ) ) {
                                        $limit = $bit;
                                }
-
+                               
+                               $m = array();
                                if ( preg_match( '/^limit=(\d+)$/', $bit, $m ) ) {
                                        $limit = $m[1];
                                }
@@ -109,7 +106,7 @@ function wfSpecialRecentchanges( $par, $specialPage ) {
 
        # Database connection and caching
        $dbr =& wfGetDB( DB_SLAVE );
-       extract( $dbr->tableNames( 'recentchanges', 'watchlist' ) );
+       list( $recentchanges, $watchlist ) = $dbr->tableNamesN( 'recentchanges', 'watchlist' );
 
 
        $cutoff_unixtime = time() - ( $days * 86400 );
@@ -200,7 +197,7 @@ function wfSpecialRecentchanges( $par, $specialPage ) {
 
                // Output header
                if ( !$specialPage->including() ) {
-                       $wgOut->addWikiText( wfMsgForContent( "recentchangestext" ) );
+                       $wgOut->addWikiText( wfMsgForContentNoTrans( "recentchangestext" ) );
 
                        // Dump everything here
                        $nondefaults = array();
@@ -224,7 +221,6 @@ function wfSpecialRecentchanges( $par, $specialPage ) {
                }
 
                // And now for the content
-               $sk = $wgUser->getSkin();
                $wgOut->setSyndicated( true );
 
                $list = ChangesList::newFromUser( $wgUser );
@@ -321,7 +317,7 @@ function rcFilterByCategories ( &$rows , $categories , $any ) {
 }
 
 function rcOutputFeed( $rows, $feedFormat, $limit, $hideminor, $lastmod ) {
-       global $messageMemc, $wgDBname, $wgFeedCacheTimeout;
+       global $messageMemc, $wgFeedCacheTimeout;
        global $wgFeedClasses, $wgTitle, $wgSitename, $wgContLanguageCode;
 
        if( !isset( $wgFeedClasses[$feedFormat] ) ) {
@@ -329,14 +325,14 @@ function rcOutputFeed( $rows, $feedFormat, $limit, $hideminor, $lastmod ) {
                return false;
        }
 
-       $timekey = "$wgDBname:rcfeed:$feedFormat:timestamp";
-       $key = "$wgDBname:rcfeed:$feedFormat:limit:$limit:minor:$hideminor";
+       $timekey = wfMemcKey( 'rcfeed', $feedFormat, 'timestamp' );
+       $key = wfMemcKey( 'rcfeed', $feedFormat, 'limit', $limit, 'minor', $hideminor );
 
        $feedTitle = $wgSitename . ' - ' . wfMsgForContent( 'recentchanges' ) .
                ' [' . $wgContLanguageCode . ']';
        $feed = new $wgFeedClasses[$feedFormat](
                $feedTitle,
-               htmlspecialchars( wfMsgForContent( 'recentchangestext' ) ),
+               htmlspecialchars( wfMsgForContent( 'recentchanges-feed-description' ) ),
                $wgTitle->getFullUrl() );
 
        /**
@@ -399,7 +395,6 @@ function rcDoOutputFeed( $rows, &$feed ) {
                        $sorted[$n] = $obj;
                        $n++;
                }
-               $first = false;
        }
 
        foreach( $sorted as $obj ) {
@@ -483,7 +478,7 @@ function makeOptionsLink( $title, $override, $options ) {
        global $wgUser, $wgContLang;
        $sk = $wgUser->getSkin();
        return $sk->makeKnownLink( $wgContLang->specialPage( 'Recentchanges' ),
-               $title, wfArrayToCGI( $override, $options ) );
+               htmlspecialchars( $title ), wfArrayToCGI( $override, $options ) );
 }
 
 /**
@@ -573,7 +568,7 @@ function rcOptionsPanel( $defaults, $nondefaults ) {
  */
 function rcNamespaceForm( $namespace, $invert, $nondefaults, $categories_any ) {
        global $wgScript, $wgAllowCategorizedRecentChanges, $wgRequest;
-       $t = Title::makeTitle( NS_SPECIAL, 'Recentchanges' );
+       $t = SpecialPage::getTitleFor( 'Recentchanges' );
 
        $namespaceselect = HTMLnamespaceselector($namespace, '');
        $submitbutton = '<input type="submit" value="' . wfMsgHtml( 'allpagessubmit' ) . "\" />\n";
@@ -583,7 +578,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;" ;
@@ -615,9 +610,10 @@ function rcNamespaceForm( $namespace, $invert, $nondefaults, $categories_any ) {
  */
 function rcFormatDiff( $row ) {
        $titleObj = Title::makeTitle( $row->rc_namespace, $row->rc_title );
+       $timestamp = wfTimestamp( TS_MW, $row->rc_timestamp );
        return rcFormatDiffRow( $titleObj,
                $row->rc_last_oldid, $row->rc_this_oldid,
-               $row->rc_timestamp,
+               $timestamp,
                $row->rc_comment );
 }
 
@@ -626,7 +622,6 @@ function rcFormatDiffRow( $title, $oldid, $newid, $timestamp, $comment ) {
        $fname = 'rcFormatDiff';
        wfProfileIn( $fname );
 
-       require_once( 'DifferenceEngine.php' );
        $skin = $wgUser->getSkin();
        $completeText = '<p>' . $skin->formatComment( $comment ) . "</p>\n";