* ( bug 18264 ) upload-by-url form was still disabled in non-js2 form output

[lhc/web/wiklou.git] / includes / specials / SpecialRecentchangeslinked.php

diff --git a/includes/specials/SpecialRecentchangeslinked.php b/includes/specials/SpecialRecentchangeslinked.php
index 82aa5b9..a5bd098 100644 (file)
--- a/includes/specials/SpecialRecentchangeslinked.php
+++ b/includes/specials/SpecialRecentchangeslinked.php
@@ -35,7 +35,7 @@ class SpecialRecentchangeslinked extends SpecialRecentchanges {
                $feed = new ChangesFeed( $feedFormat, false );
                $feedObj = $feed->getFeedObject(
                        wfMsgForContent( 'recentchangeslinked-title', $this->mTargetTitle->getPrefixedText() ),
-                       wfMsgForContent( 'recentchangeslinked' )
+                       wfMsgForContent( 'recentchangeslinked-feed' )
                );
                return array( $feed, $feedObj );
        }
@@ -84,6 +84,11 @@ class SpecialRecentchangeslinked extends SpecialRecentchanges {
                        $select[] = 'wl_user';
                        $join_conds['watchlist'] = array( 'LEFT JOIN', "wl_user={$uid} AND wl_title=rc_title AND wl_namespace=rc_namespace" );
                }
+               if ( $wgUser->isAllowed( 'rollback' ) ) {
+                       $tables[] = 'page';
+                       $join_conds['page'] = array('LEFT JOIN', 'rc_cur_id=page_id');
+                       $select[] = 'page_latest';
+               }
 
                ChangeTags::modifyDisplayQuery( $tables, $select, $conds, $join_conds,
                        $query_options, $opts['tagfilter'] );
@@ -155,9 +160,10 @@ class SpecialRecentchangeslinked extends SpecialRecentchanges {
                        $sql = $subsql[0];
                else {
                        // need to resort and relimit after union
-                       $sql = "(" . implode( ") UNION (", $subsql ) . ") ORDER BY rc_timestamp DESC LIMIT {$limit}";
+                       $sql = $dbr->unionQueries($subsql, false).' ORDER BY rc_timestamp DESC';
+                       $sql = $dbr->limitResult($sql, $limit, false);
                }
-
+               
                $res = $dbr->query( $sql, __METHOD__ );
 
                if( $res->numRows() == 0 )
@@ -167,10 +173,10 @@ class SpecialRecentchangeslinked extends SpecialRecentchanges {
        }
        
        function getExtraOptions( $opts ){
-               $opts->consumeValues( array( 'showlinkedto', 'target' ) );
+               $opts->consumeValues( array( 'showlinkedto', 'target', 'tagfilter' ) );
                $extraOpts = array();
                $extraOpts['namespace'] = $this->namespaceFilterForm( $opts );
-               $extraOpts['target'] = array( wfMsg( 'recentchangeslinked-page' ),
+               $extraOpts['target'] = array( wfMsgHtml( 'recentchangeslinked-page' ),
                        Xml::input( 'target', 40, str_replace('_',' ',$opts['target']) ) .
                        Xml::check( 'showlinkedto', $opts['showlinkedto'], array('id' => 'showlinkedto') ) . ' ' .
                        Xml::label( wfMsg("recentchangeslinked-to"), 'showlinkedto' ) );