FU 97704: I was thinking the space was already added in this case
[lhc/web/wiklou.git] / includes / specials / SpecialContributions.php
index ec21c9c..7e513bf 100644 (file)
 <?php
 /**
- * Special:Contributions, show user contributions in a paged list
+ * Implements Special:Contributions
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @file
  * @ingroup SpecialPage
  */
+
+/**
+ * Special:Contributions, show user contributions in a paged list
+ *
+ * @ingroup SpecialPage
+ */
+
 class SpecialContributions extends SpecialPage {
 
+       protected $opts;
+
        public function __construct() {
                parent::__construct( 'Contributions' );
        }
 
        public function execute( $par ) {
-               global $wgUser, $wgOut, $wgLang, $wgRequest;
-
                $this->setHeaders();
                $this->outputHeader();
+               $out = $this->getOutput();
+               $out->addModuleStyles( 'mediawiki.special' );
 
                $this->opts = array();
+               $request = $this->getRequest();
 
                if( $par == 'newbies' ) {
                        $target = 'newbies';
                        $this->opts['contribs'] = 'newbie';
-               } elseif( isset( $par ) ) {
+               } elseif( $par !== null ) {
                        $target = $par;
                } else {
-                       $target = $wgRequest->getVal( 'target' );
+                       $target = $request->getVal( 'target' );
                }
 
                // check for radiobox
-               if( $wgRequest->getVal( 'contribs' ) == 'newbie' ) {
+               if( $request->getVal( 'contribs' ) == 'newbie' ) {
                        $target = 'newbies';
                        $this->opts['contribs'] = 'newbie';
                }
 
+               $this->opts['deletedOnly'] = $request->getBool( 'deletedOnly' );
+
                if( !strlen( $target ) ) {
-                       $wgOut->addHTML( $this->getForm() );
+                       $out->addHTML( $this->getForm() );
                        return;
                }
 
-               $this->opts['limit'] = $wgRequest->getInt( 'limit', $wgUser->getOption('rclimit') );
+               $user = $this->getUser();
+
+               $this->opts['limit'] = $request->getInt( 'limit', $user->getOption('rclimit') );
                $this->opts['target'] = $target;
+               $this->opts['topOnly'] = $request->getBool( 'topOnly' );
 
                $nt = Title::makeTitleSafe( NS_USER, $target );
                if( !$nt ) {
-                       $wgOut->addHTML( $this->getForm() );
+                       $out->addHTML( $this->getForm() );
                        return;
                }
                $id = User::idFromName( $nt->getText() );
 
                if( $target != 'newbies' ) {
                        $target = $nt->getText();
-                       $wgOut->setSubtitle( $this->contributionsSub( $nt, $id ) );
-                       $wgOut->setHTMLTitle( wfMsg( 'pagetitle', wfMsgExt( 'contributions-title', array( 'parsemag' ),$target ) ) );
+                       $out->setSubtitle( $this->contributionsSub( $nt, $id ) );
+                       $out->setHTMLTitle( wfMsg( 'pagetitle', wfMsgExt( 'contributions-title', array( 'parsemag' ),$target ) ) );
+                       $userObj = User::newFromName( $target, false );
+                       if ( is_object( $userObj ) ) {
+                               $this->getSkin()->setRelevantUser( $userObj );
+                       }
                } else {
-                       $wgOut->setSubtitle( wfMsgHtml( 'sp-contributions-newbies-sub') );
-                       $wgOut->setHTMLTitle( wfMsg( 'pagetitle', wfMsg( 'sp-contributions-newbies-title' ) ) );
+                       $out->setSubtitle( wfMsgHtml( 'sp-contributions-newbies-sub') );
+                       $out->setHTMLTitle( wfMsg( 'pagetitle', wfMsg( 'sp-contributions-newbies-title' ) ) );
                }
 
-               if( ( $ns = $wgRequest->getVal( 'namespace', null ) ) !== null && $ns !== '' ) {
+               if( ( $ns = $request->getVal( 'namespace', null ) ) !== null && $ns !== '' ) {
                        $this->opts['namespace'] = intval( $ns );
                } else {
                        $this->opts['namespace'] = '';
                }
 
-               $this->opts['tagfilter'] = (string) $wgRequest->getVal( 'tagfilter' );
-       
+               $this->opts['tagFilter'] = (string) $request->getVal( 'tagFilter' );
+
                // Allows reverts to have the bot flag in recent changes. It is just here to
-               // be passed in the form at the top of the page 
-               if( $wgUser->isAllowed( 'markbotedits' ) && $wgRequest->getBool( 'bot' ) ) {
+               // be passed in the form at the top of the page
+               if( $user->isAllowed( 'markbotedits' ) && $request->getBool( 'bot' ) ) {
                        $this->opts['bot'] = '1';
                }
 
-               $skip = $wgRequest->getText( 'offset' ) || $wgRequest->getText( 'dir' ) == 'prev';
+               $skip = $request->getText( 'offset' ) || $request->getText( 'dir' ) == 'prev';
                # Offset overrides year/month selection
                if( $skip ) {
                        $this->opts['year'] = '';
                        $this->opts['month'] = '';
                } else {
-                       $this->opts['year'] = $wgRequest->getIntOrNull( 'year' );
-                       $this->opts['month'] = $wgRequest->getIntOrNull( 'month' );
-               }
-               
-               // Add RSS/atom links
-               $this->setSyndicated();
-               $feedType = $wgRequest->getVal( 'feed' );
-               if( $feedType ) {
-                       return $this->feed( $feedType );
+                       $this->opts['year'] = $request->getIntOrNull( 'year' );
+                       $this->opts['month'] = $request->getIntOrNull( 'month' );
                }
 
-               wfRunHooks( 'SpecialContributionsBeforeMainOutput', $id );
+               $feedType = $request->getVal( 'feed' );
+               if( $feedType ) {
+                       // Maintain some level of backwards compatability
+                       // If people request feeds using the old parameters, redirect to API
+                       $apiParams = array(
+                               'action' => 'feedcontributions',
+                               'feedformat' => $feedType,
+                               'user' => $target,
+                       );
+                       if ( $this->opts['topOnly'] ) {
+                               $apiParams['toponly'] = true;
+                       }
+                       if ( $this->opts['deletedOnly'] ) {
+                               $apiParams['deletedonly'] = true;
+                       }
+                       if ( $this->opts['tagFilter'] !== '' ) {
+                               $apiParams['tagfilter'] = $this->opts['tagFilter'];
+                       }
+                       if ( $this->opts['namespace'] !== '' ) {
+                               $apiParams['namespace'] = $this->opts['namespace'];
+                       }
+                       if ( $this->opts['year'] !== null ) {
+                               $apiParams['year'] = $this->opts['year'];
+                       }
+                       if ( $this->opts['month'] !== null ) {
+                               $apiParams['month'] = $this->opts['month'];
+                       }
 
-               $wgOut->addHTML( $this->getForm() );
+                       $url = wfScript( 'api' ) . '?' . wfArrayToCGI( $apiParams );
 
-               $pager = new ContribsPager( $target, $this->opts['namespace'], $this->opts['year'], $this->opts['month'] );
-               if( !$pager->getNumRows() ) {
-                       $wgOut->addWikiMsg( 'nocontribs', $target );
-               } else {
-                       # Show a message about slave lag, if applicable
-                       if( ( $lag = $pager->getDatabase()->getLag() ) > 0 )
-                               $wgOut->showLagWarning( $lag );
-
-                       $wgOut->addHTML(
-                               '<p>' . $pager->getNavigationBar() . '</p>' .
-                               $pager->getBody() .
-                               '<p>' . $pager->getNavigationBar() . '</p>'
-                       );
+                       $out->redirect( $url, '301' );
+                       return;
                }
 
-
-               # Show the appropriate "footer" message - WHOIS tools, etc.
-               if( $target != 'newbies' ) {
-                       $message = 'sp-contributions-footer';
-                       if ( IP::isIPAddress( $target ) ) {
-                               $message = 'sp-contributions-footer-anon';
+               // Add RSS/atom links
+               $this->addFeedLinks( array( 'action' => 'feedcontributions', 'user' => $target ) );
+
+               if ( wfRunHooks( 'SpecialContributionsBeforeMainOutput', array( $id ) ) ) {
+
+                       $out->addHTML( $this->getForm() );
+
+                       $pager = new ContribsPager( array(
+                               'target' => $target,
+                               'namespace' => $this->opts['namespace'],
+                               'year' => $this->opts['year'],
+                               'month' => $this->opts['month'],
+                               'deletedOnly' => $this->opts['deletedOnly'],
+                               'topOnly' => $this->opts['topOnly'],
+                       ) );
+                       if( !$pager->getNumRows() ) {
+                               $out->addWikiMsg( 'nocontribs', $target );
                        } else {
-                               $user = User::newFromName( $target );
-                               if ( !$user || $user->isAnon() ) {
-                                       // No message for non-existing users
-                                       return;
-                               }
+                               # Show a message about slave lag, if applicable
+                               $lag = wfGetLB()->safeGetLag( $pager->getDatabase() );
+                               if( $lag > 0 )
+                                       $out->showLagWarning( $lag );
+
+                               $out->addHTML(
+                                       '<p>' . $pager->getNavigationBar() . '</p>' .
+                                       $pager->getBody() .
+                                       '<p>' . $pager->getNavigationBar() . '</p>'
+                               );
                        }
+                       $out->preventClickjacking( $pager->getPreventClickjacking() );
+
+                       # Show the appropriate "footer" message - WHOIS tools, etc.
+                       if( $target != 'newbies' ) {
+                               $message = 'sp-contributions-footer';
+                               if ( IP::isIPAddress( $target ) ) {
+                                       $message = 'sp-contributions-footer-anon';
+                               } else {
+                                       $userObj = User::newFromName( $target );
+                                       if ( !$userObj || $userObj->isAnon() ) {
+                                               // No message for non-existing users
+                                               return;
+                                       }
+                               }
 
-                       $text = wfMsgNoTrans( $message, $target );
-                       if( !wfEmptyMsg( $message, $text ) && $text != '-' ) {
-                               $wgOut->wrapWikiMsg(
-                                       "<div class='mw-contributions-footer'>\n$1\n</div>",
-                                       array( $message, $target ) );
+                               if( !wfMessage( $message, $target )->isDisabled() ) {
+                                       $out->wrapWikiMsg(
+                                               "<div class='mw-contributions-footer'>\n$1\n</div>",
+                                               array( $message, $target ) );
+                               }
                        }
                }
        }
-       
-       protected function setSyndicated() {
-               global $wgOut;
-               $queryParams = array(
-                       'namespace' => $this->opts['namespace'],
-                       'target'  => $this->opts['target']
-               );
-               $wgOut->setSyndicated( true );
-               $wgOut->setFeedAppendQuery( wfArrayToCGI( $queryParams ) );
-       }
 
        /**
-       * Generates the subheading with links
-       * @param Title $nt Title object for the target
-       * @param integer $id User ID for the target
-       * @return String: appropriately-escaped HTML to be output literally
-       */
+        * Generates the subheading with links
+        * @param $nt Title object for the target
+        * @param $id Integer: User ID for the target
+        * @return String: appropriately-escaped HTML to be output literally
+        * @todo FIXME: Almost the same as getSubTitle in SpecialDeletedContributions.php. Could be combined.
+        */
        protected function contributionsSub( $nt, $id ) {
-               global $wgSysopUserBans, $wgLang, $wgUser, $wgOut;
-
-               $sk = $wgUser->getSkin();
-
-               if( 0 == $id ) {
+               if ( $id === null ) {
                        $user = htmlspecialchars( $nt->getText() );
                } else {
-                       $user = $sk->link( $nt, htmlspecialchars( $nt->getText() ) );
+                       $user = Linker::link( $nt, htmlspecialchars( $nt->getText() ) );
                }
                $userObj = User::newFromName( $nt->getText(), /* check for username validity not needed */ false );
                $talk = $nt->getTalkPage();
                if( $talk ) {
-                       # Talk page link
-                       $tools[] = $sk->link( $talk, wfMsgHtml( 'sp-contributions-talk' ) );
-                       if( ( $id != 0 && $wgSysopUserBans ) || ( $id == 0 && IP::isIPAddress( $nt->getText() ) ) ) {
-                               if( $wgUser->isAllowed( 'block' ) ) { # Block / Change block / Unblock links
-                                       if ( $userObj->isBlocked() ) {
-                                               $tools[] = $sk->linkKnown( # Change block link
-                                                       SpecialPage::getTitleFor( 'Blockip', $nt->getDBkey() ),
-                                                       wfMsgHtml( 'change-blocklink' )
-                                               );
-                                               $tools[] = $sk->linkKnown( # Unblock link
-                                                       SpecialPage::getTitleFor( 'BlockList' ),
-                                                       wfMsgHtml( 'unblocklink' ),
-                                                       array(),
-                                                       array(
-                                                               'action' => 'unblock',
-                                                               'ip' => $nt->getDBkey() 
-                                                       )
-                                               );
-                                       }
-                                       else { # User is not blocked
-                                               $tools[] = $sk->linkKnown( # Block link
-                                                       SpecialPage::getTitleFor( 'Blockip', $nt->getDBkey() ),
-                                                       wfMsgHtml( 'blocklink' )
-                                               );
-                                       }
-                               }
-                               # Block log link
-                               $tools[] = $sk->linkKnown(
-                                       SpecialPage::getTitleFor( 'Log' ),
-                                       wfMsgHtml( 'sp-contributions-blocklog' ),
-                                       array(),
-                                       array(
-                                               'type' => 'block',
-                                               'page' => $nt->getPrefixedText()
-                                       )
-                               );
-                       }
-                       # Other logs link
-                       $tools[] = $sk->linkKnown(
-                               SpecialPage::getTitleFor( 'Log' ),
-                               wfMsgHtml( 'sp-contributions-logs' ),
-                               array(),
-                               array( 'user' => $nt->getText() )
-                       );
-
-                       # Add link to deleted user contributions for priviledged users
-                       if( $wgUser->isAllowed( 'deletedhistory' ) ) {
-                               $tools[] = $sk->linkKnown(
-                                       SpecialPage::getTitleFor( 'DeletedContributions', $nt->getDBkey() ),
-                                       wfMsgHtml( 'sp-contributions-deleted' )
-                               );
-                       }
-
-                       # Add a link to change user rights for privileged users
-                       $userrightsPage = new UserrightsPage();
-                       if( 0 !== $id && $userrightsPage->userCanChangeRights( User::newFromId( $id ) ) ) {
-                               $tools[] = $sk->linkKnown(
-                                       SpecialPage::getTitleFor( 'Userrights', $nt->getDBkey() ),
-                                       wfMsgHtml( 'sp-contributions-userrights' )
-                               );
-                       }
-
-                       wfRunHooks( 'ContributionsToolLinks', array( $id, $nt, &$tools ) );
-       
-                       $links = $wgLang->pipeList( $tools );
+                       $tools = self::getUserLinks( $nt, $talk, $userObj, $this->getUser() );
+                       $links = $this->getLang()->pipeList( $tools );
 
                        // Show a note if the user is blocked and display the last block log entry.
                        if ( $userObj->isBlocked() ) {
+                               $out = $this->getOutput(); // showLogExtract() wants first parameter by reference
                                LogEventsList::showLogExtract(
-                                       $wgOut,
+                                       $out,
                                        'block',
                                        $nt->getPrefixedText(),
                                        '',
@@ -237,10 +234,12 @@ class SpecialContributions extends SpecialPage {
                                                'lim' => 1,
                                                'showIfEmpty' => false,
                                                'msgKey' => array(
-                                                       'sp-contributions-blocked-notice',
+                                                       $userObj->isAnon() ?
+                                                               'sp-contributions-blocked-notice-anon' :
+                                                               'sp-contributions-blocked-notice',
                                                        $nt->getText() # Support GENDER in 'sp-contributions-blocked-notice'
                                                ),
-                                               'offset' => '' # don't use $wgRequest parameter offset
+                                               'offset' => '' # don't use WebRequest parameter offset
                                        )
                                );
                        }
@@ -250,176 +249,177 @@ class SpecialContributions extends SpecialPage {
                // languages that want to put the "for" bit right after $user but before
                // $links.  If 'contribsub' is around, use it for reverse compatibility,
                // otherwise use 'contribsub2'.
-               if( wfEmptyMsg( 'contribsub', wfMsg( 'contribsub' ) ) ) {
+               if( wfEmptyMsg( 'contribsub' ) ) {
                        return wfMsgHtml( 'contribsub2', $user, $links );
                } else {
                        return wfMsgHtml( 'contribsub', "$user ($links)" );
                }
        }
 
+       /**
+        * Links to different places.
+        * @param $userpage Title: Target user page
+        * @param $talkpage Title: Talk page
+        * @param $target User: Target user object
+        * @param $subject User: The viewing user ($wgUser might be still checked in some cases)
+        */
+       public static function getUserLinks( Title $userpage, Title $talkpage, User $target, User $subject ) {
+
+               $id = $target->getId();
+               $username = $target->getName();
+
+               $tools[] = Linker::link( $talkpage, wfMsgHtml( 'sp-contributions-talk' ) );
+
+               if( ( $id !== null ) || ( $id === null && IP::isIPAddress( $username ) ) ) {
+                       if( $subject->isAllowed( 'block' ) ) { # Block / Change block / Unblock links
+                               if ( $target->isBlocked() ) {
+                                       $tools[] = Linker::linkKnown( # Change block link
+                                               SpecialPage::getTitleFor( 'Block', $username ),
+                                               wfMsgHtml( 'change-blocklink' )
+                                       );
+                                       $tools[] = Linker::linkKnown( # Unblock link
+                                               SpecialPage::getTitleFor( 'Unblock', $username ),
+                                               wfMsgHtml( 'unblocklink' )
+                                       );
+                               } else { # User is not blocked
+                                       $tools[] = Linker::linkKnown( # Block link
+                                               SpecialPage::getTitleFor( 'Block', $username ),
+                                               wfMsgHtml( 'blocklink' )
+                                       );
+                               }
+                       }
+                       # Block log link
+                       $tools[] = Linker::linkKnown(
+                               SpecialPage::getTitleFor( 'Log', 'block' ),
+                               wfMsgHtml( 'sp-contributions-blocklog' ),
+                               array(),
+                               array(
+                                       'page' => $userpage->getPrefixedText()
+                               )
+                       );
+               }
+               # Uploads
+               $tools[] = Linker::linkKnown(
+                       SpecialPage::getTitleFor( 'Listfiles', $username ),
+                       wfMsgHtml( 'sp-contributions-uploads' )
+               );
+
+               # Other logs link
+               $tools[] = Linker::linkKnown(
+                       SpecialPage::getTitleFor( 'Log', $username ),
+                       wfMsgHtml( 'sp-contributions-logs' )
+               );
+
+               # Add link to deleted user contributions for priviledged users
+               if( $subject->isAllowed( 'deletedhistory' ) && !$subject->isBlocked() ) {
+                       $tools[] = Linker::linkKnown(
+                               SpecialPage::getTitleFor( 'DeletedContributions', $username ),
+                               wfMsgHtml( 'sp-contributions-deleted' )
+                       );
+               }
+
+               # Add a link to change user rights for privileged users
+               $userrightsPage = new UserrightsPage();
+               $userrightsPage->getContext()->setUser( $subject );
+               if( $id !== null && $userrightsPage->userCanChangeRights( $target ) ) {
+                       $tools[] = Linker::linkKnown(
+                               SpecialPage::getTitleFor( 'Userrights', $username ),
+                               wfMsgHtml( 'sp-contributions-userrights' )
+                       );
+               }
+
+               wfRunHooks( 'ContributionsToolLinks', array( $id, $userpage, &$tools ) );
+               return $tools;
+       }
+
        /**
         * Generates the namespace selector form with hidden attributes.
-        * @param $this->opts Array: the options to be included.
+        * @return String: HTML fragment
         */
        protected function getForm() {
-               global $wgScript;
-       
+               global $wgScript, $wgMiserMode;
+
                $this->opts['title'] = $this->getTitle()->getPrefixedText();
                if( !isset( $this->opts['target'] ) ) {
                        $this->opts['target'] = '';
                } else {
                        $this->opts['target'] = str_replace( '_' , ' ' , $this->opts['target'] );
                }
-       
+
                if( !isset( $this->opts['namespace'] ) ) {
                        $this->opts['namespace'] = '';
                }
-       
+
                if( !isset( $this->opts['contribs'] ) ) {
                        $this->opts['contribs'] = 'user';
                }
-       
+
                if( !isset( $this->opts['year'] ) ) {
                        $this->opts['year'] = '';
                }
-       
+
                if( !isset( $this->opts['month'] ) ) {
                        $this->opts['month'] = '';
                }
-       
+
                if( $this->opts['contribs'] == 'newbie' ) {
                        $this->opts['target'] = '';
                }
 
-               if( !isset( $this->opts['tagfilter'] ) ) {
-                       $this->opts['tagfilter'] = '';
+               if( !isset( $this->opts['tagFilter'] ) ) {
+                       $this->opts['tagFilter'] = '';
+               }
+
+               if( !isset( $this->opts['topOnly'] ) ) {
+                       $this->opts['topOnly'] = false;
                }
-       
-               $f = Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) );
-               # Add hidden params for tracking
+
+               $f = Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript, 'class' => 'mw-contributions-form' ) );
+
+               # Add hidden params for tracking except for parameters in $skipParameters
+               $skipParameters = array( 'namespace', 'deletedOnly', 'target', 'contribs', 'year', 'month', 'topOnly' );
                foreach ( $this->opts as $name => $value ) {
-                       if( in_array( $name, array( 'namespace', 'target', 'contribs', 'year', 'month' ) ) ) {
+                       if( in_array( $name, $skipParameters ) ) {
                                continue;
                        }
-                       $f .= "\t" . Xml::hidden( $name, $value ) . "\n";
+                       $f .= "\t" . Html::hidden( $name, $value ) . "\n";
                }
 
-               $tagFilter = ChangeTags::buildTagFilterSelector( $this->opts['tagfilter'] );
-       
-               $f .= '<fieldset>' .
-                       Xml::element( 'legend', array(), wfMsg( 'sp-contributions-search' ) ) .
-                       Xml::radioLabel( wfMsgExt( 'sp-contributions-newbies', array( 'parsemag' ) ), 
-                               'contribs', 'newbie' , 'newbie', $this->opts['contribs'] == 'newbie' ? true : false ) . '<br />' .
-                       Xml::radioLabel( wfMsgExt( 'sp-contributions-username', array( 'parsemag' ) ), 
-                               'contribs' , 'user', 'user', $this->opts['contribs'] == 'user' ? true : false ) . ' ' .
+               $tagFilter = ChangeTags::buildTagFilterSelector( $this->opts['tagFilter'] );
+
+               $fNS = ( $wgMiserMode ) ? '' :
+                       Html::rawElement( 'span', array( 'style' => 'white-space: nowrap' ),
+                               Xml::label( wfMsg( 'namespace' ), 'namespace' ) . ' ' .
+                               Xml::namespaceSelector( $this->opts['namespace'], '' )
+                       );
+
+               $f .=   Xml::fieldset( wfMsg( 'sp-contributions-search' ) ) .
+                       Xml::radioLabel( wfMsgExt( 'sp-contributions-newbies', array( 'parsemag' ) ),
+                               'contribs', 'newbie' , 'newbie', $this->opts['contribs'] == 'newbie' ) . '<br />' .
+                       Xml::radioLabel( wfMsgExt( 'sp-contributions-username', array( 'parsemag' ) ),
+                               'contribs' , 'user', 'user', $this->opts['contribs'] == 'user' ) . ' ' .
                        Html::input( 'target', $this->opts['target'], 'text', array(
                                'size' => '20',
                                'required' => ''
                        ) + ( $this->opts['target'] ? array() : array( 'autofocus' ) ) ) . ' '.
-                       '<span style="white-space: nowrap">' .
-                       Xml::label( wfMsg( 'namespace' ), 'namespace' ) . ' ' .
-                       Xml::namespaceSelector( $this->opts['namespace'], '' ) .
-                       '</span>' .
-                       ( $tagFilter ? Xml::tags( 'p', null, implode( '&nbsp;', $tagFilter ) ) : '' ) .
-                       Xml::openElement( 'p' ) .
-                       '<span style="white-space: nowrap">' .
-                       Xml::dateMenu( $this->opts['year'], $this->opts['month'] ) .
-                       '</span>' . ' ' .
-                       Xml::submitButton( wfMsg( 'sp-contributions-submit' ) ) .
-                       Xml::closeElement( 'p' );
-       
-               $explain = wfMsgExt( 'sp-contributions-explain', 'parseinline' );
-               if( !wfEmptyMsg( 'sp-contributions-explain', $explain ) )
+                       $fNS.
+                       Xml::checkLabel( wfMsg( 'history-show-deleted' ),
+                               'deletedOnly', 'mw-show-deleted-only', $this->opts['deletedOnly'] ) . '<br />' .
+                       Xml::tags( 'p', null, Xml::checkLabel( wfMsg( 'sp-contributions-toponly' ),
+                               'topOnly', 'mw-show-top-only', $this->opts['topOnly'] ) ) .
+                       ( $tagFilter ? Xml::tags( 'p', null, implode( '&#160;', $tagFilter ) ) : '' ) .
+                       Html::rawElement( 'p', array( 'style' => 'white-space: nowrap' ),
+                               Xml::dateMenu( $this->opts['year'], $this->opts['month'] ) . ' ' .
+                               Xml::submitButton( wfMsg( 'sp-contributions-submit' ) )
+                       ) . ' ';
+               $explain = wfMessage( 'sp-contributions-explain' );
+               if ( $explain->exists() ) {
                        $f .= "<p id='mw-sp-contributions-explain'>{$explain}</p>";
-       
-               $f .= '</fieldset>' .
+               }
+               $f .= Xml::closeElement('fieldset' ) .
                        Xml::closeElement( 'form' );
                return $f;
        }
-       
-       /**
-        * Output a subscription feed listing recent edits to this page.
-        * @param string $type
-        */
-       protected function feed( $type ) {
-               global $wgRequest, $wgFeed, $wgFeedClasses, $wgFeedLimit;
-
-               if( !$wgFeed ) {
-                       global $wgOut;
-                       $wgOut->addWikiMsg( 'feed-unavailable' );
-                       return;
-               }
-
-               if( !isset( $wgFeedClasses[$type] ) ) {
-                       global $wgOut;
-                       $wgOut->addWikiMsg( 'feed-invalid' );
-                       return;
-               }
-
-               $feed = new $wgFeedClasses[$type](
-                       $this->feedTitle(),
-                       wfMsgExt( 'tagline', 'parsemag' ),
-                       $this->getTitle()->getFullUrl() . "/" . urlencode($this->opts['target'])
-               );
-                       
-               // Already valid title
-               $nt = Title::makeTitleSafe( NS_USER, $this->opts['target'] );
-               $target = $this->opts['target'] == 'newbies' ? 'newbies' : $nt->getText();
-                       
-               $pager = new ContribsPager( $target, $this->opts['namespace'], 
-                       $this->opts['year'], $this->opts['month'], $this->opts['tagfilter'] );
-
-               $pager->mLimit = min( $this->opts['limit'], $wgFeedLimit );
-
-               $feed->outHeader();
-               if( $pager->getNumRows() > 0 ) {
-                       while( $row = $pager->mResult->fetchObject() ) {
-                               $feed->outItem( $this->feedItem( $row ) );
-                       }
-               }
-               $feed->outFooter();
-       }
-
-       protected function feedTitle() {
-               global $wgContLanguageCode, $wgSitename;
-               $page = SpecialPage::getPage( 'Contributions' );
-               $desc = $page->getDescription();
-               return "$wgSitename - $desc [$wgContLanguageCode]";
-       }
-
-       protected function feedItem( $row ) {
-               $title = Title::MakeTitle( intval( $row->page_namespace ), $row->page_title );
-               if( $title ) {
-                       $date = $row->rev_timestamp;
-                       $comments = $title->getTalkPage()->getFullURL();
-                       $revision = Revision::newFromTitle( $title, $row->rev_id );
-
-                       return new FeedItem(
-                               $title->getPrefixedText(),
-                               $this->feedItemDesc( $revision ),
-                               $title->getFullURL(),
-                               $date,
-                               $this->feedItemAuthor( $revision ),
-                               $comments
-                       );
-               } else {
-                       return NULL;
-               }
-       }
-
-       protected function feedItemAuthor( $revision ) {
-               return $revision->getUserText();
-       }
-
-       protected function feedItemDesc( $revision ) {
-               if( $revision ) {
-                       return '<p>' . htmlspecialchars( $revision->getUserText() ) . wfMsgForContent( 'colon-separator' ) .
-                               htmlspecialchars( FeedItem::stripComment( $revision->getComment() ) ) . 
-                               "</p>\n<hr />\n<div>" .
-                               nl2br( htmlspecialchars( $revision->getText() ) ) . "</div>";
-               }
-               return '';
-       }
 }
 
 /**
@@ -430,20 +430,26 @@ class ContribsPager extends ReverseChronologicalPager {
        public $mDefaultDirection = true;
        var $messages, $target;
        var $namespace = '', $mDb;
+       var $preventClickjacking = false;
 
-       function __construct( $target, $namespace = false, $year = false, $month = false, $tagFilter = false ) {
+       function __construct( $options ) {
                parent::__construct();
 
                $msgs = array( 'uctop', 'diff', 'newarticle', 'rollbacklink', 'diff', 'hist', 'rev-delundel', 'pipe-separator' );
 
                foreach( $msgs as $msg ) {
-                       $this->messages[$msg] = wfMsgExt( $msg, array( 'escape' ) );
+                       $this->messages[$msg] = wfMsgExt( $msg, array( 'escapenoentities' ) );
                }
 
-               $this->target = $target;
-               $this->namespace = $namespace;
-               $this->tagFilter = $tagFilter;
+               $this->target = isset( $options['target'] ) ? $options['target'] : '';
+               $this->namespace = isset( $options['namespace'] ) ? $options['namespace'] : '';
+               $this->tagFilter = isset( $options['tagFilter'] ) ? $options['tagFilter'] : false;
+
+               $this->deletedOnly = !empty( $options['deletedOnly'] );
+               $this->topOnly = !empty( $options['topOnly'] );
 
+               $year = isset( $options['year'] ) ? $options['year'] : false;
+               $month = isset( $options['month'] ) ? $options['month'] : false;
                $this->getDateCond( $year, $month );
 
                $this->mDb = wfGetDB( DB_SLAVE, 'contributions' );
@@ -456,25 +462,26 @@ class ContribsPager extends ReverseChronologicalPager {
        }
 
        function getQueryInfo() {
-               global $wgUser;
                list( $tables, $index, $userCond, $join_cond ) = $this->getUserCond();
-               
+
+               $user = $this->getUser();
                $conds = array_merge( $userCond, $this->getNamespaceCond() );
                // Paranoia: avoid brute force searches (bug 17342)
-               if( !$wgUser->isAllowed( 'deletedhistory' ) ) {
+               if( !$user->isAllowed( 'deletedhistory' ) || $user->isBlocked() ) {
                        $conds[] = $this->mDb->bitAnd('rev_deleted',Revision::DELETED_USER) . ' = 0';
-               } else if( !$wgUser->isAllowed( 'suppressrevision' ) ) {
+               } elseif( !$user->isAllowed( 'suppressrevision' ) ) {
                        $conds[] = $this->mDb->bitAnd('rev_deleted',Revision::SUPPRESSED_USER) .
                                ' != ' . Revision::SUPPRESSED_USER;
                }
                $join_cond['page'] = array( 'INNER JOIN', 'page_id=rev_page' );
-               
+
                $queryInfo = array(
                        'tables' => $tables,
                        'fields' => array(
                                'page_namespace', 'page_title', 'page_is_new', 'page_latest', 'page_is_redirect',
-                               'page_len','rev_id', 'rev_page', 'rev_text_id', 'rev_timestamp', 'rev_comment', 
-                               'rev_minor_edit', 'rev_user', 'rev_user_text', 'rev_parent_id', 'rev_deleted'
+                               'page_len','rev_id', 'rev_page', 'rev_text_id', 'rev_timestamp', 'rev_comment',
+                               'rev_minor_edit', 'rev_user', 'rev_user_text', 'rev_parent_id', 'rev_deleted',
+                               'rev_len', 'rev_parent_id'
                        ),
                        'conds' => $conds,
                        'options' => array( 'USE INDEX' => array('revision' => $index) ),
@@ -503,18 +510,25 @@ class ContribsPager extends ReverseChronologicalPager {
                        $condition[] = 'rev_user >' . (int)($max - $max / 100);
                        $condition[] = 'ug_group IS NULL';
                        $index = 'user_timestamp';
-                       # FIXME: other groups may have 'bot' rights
+                       # @todo FIXME: Other groups may have 'bot' rights
                        $join_conds['user_groups'] = array( 'LEFT JOIN', "ug_user = rev_user AND ug_group = 'bot'" );
                } else {
                        $tables = array( 'page', 'revision' );
                        $condition['rev_user_text'] = $this->target;
                        $index = 'usertext_timestamp';
                }
+               if( $this->deletedOnly ) {
+                       $condition[] = "rev_deleted != '0'";
+               }
+               if( $this->topOnly ) {
+                       $condition[] = "rev_id = page_latest";
+               }
                return array( $tables, $index, $condition, $join_conds );
        }
 
        function getNamespaceCond() {
-               if( $this->namespace !== '' ) {
+               global $wgMiserMode;
+               if( $this->namespace !== '' && !$wgMiserMode ) {
                        return array( 'page_namespace' => (int)$this->namespace );
                } else {
                        return array();
@@ -533,6 +547,44 @@ class ContribsPager extends ReverseChronologicalPager {
                return "</ul>\n";
        }
 
+       function getBody() {
+               global $wgRCShowChangedSize;
+               if( !$this->mQueryDone ) {
+                       $this->doQuery();
+               }
+               $this->mParentLens = array();
+               if( $wgRCShowChangedSize ) {
+                       $this->mResult->rewind();
+                       $revIds = array();
+                       foreach( $this->mResult as $row ) {
+                               $revIds[] = $row->rev_parent_id;
+                       }
+                       $this->mParentLens = $this->getParentLengths( $revIds );
+                       $this->mResult->rewind();
+               }
+               return parent::getBody();
+       }
+
+       /*
+        * Do a batched query to get the parent revision lengths
+        */
+       private function getParentLengths( array $revIds ) {
+               $revLens = array();
+               if ( !$revIds ) {
+                       return $revLens; // empty
+               }
+               wfProfileIn( __METHOD__ );
+               $res = $this->getDatabase()->select( 'revision',
+                       array( 'rev_id', 'rev_len' ),
+                       array( 'rev_id' => $revIds ),
+                       __METHOD__ );
+               foreach( $res as $row ) {
+                       $revLens[$row->rev_id] = $row->rev_len;
+               }
+               wfProfileOut( __METHOD__ );
+               return $revLens;
+       }
+
        /**
         * Generates each row in the contributions list.
         *
@@ -544,33 +596,33 @@ class ContribsPager extends ReverseChronologicalPager {
         * @todo This would probably look a lot nicer in a table.
         */
        function formatRow( $row ) {
-               global $wgUser, $wgLang, $wgContLang;
                wfProfileIn( __METHOD__ );
 
-               $sk = $this->getSkin();
                $rev = new Revision( $row );
                $classes = array();
 
                $page = Title::newFromRow( $row );
-               $page->resetArticleId( $row->rev_page ); // use process cache
-               $link = $sk->link(
+               $link = Linker::link(
                        $page,
                        htmlspecialchars( $page->getPrefixedText() ),
                        array(),
                        $page->isRedirect() ? array( 'redirect' => 'no' ) : array()
                );
                # Mark current revisions
-               $difftext = $topmarktext = '';
+               $topmarktext = '';
                if( $row->rev_id == $row->page_latest ) {
                        $topmarktext .= '<span class="mw-uctop">' . $this->messages['uctop'] . '</span>';
                        # Add rollback link
-                       if( !$row->page_is_new && $page->quickUserCan( 'rollback' ) && $page->quickUserCan( 'edit' ) ) {
-                               $topmarktext .= ' '.$sk->generateRollback( $rev );
+                       if( !$row->page_is_new && $page->quickUserCan( 'rollback' )
+                               && $page->quickUserCan( 'edit' ) )
+                       {
+                               $this->preventClickjacking();
+                               $topmarktext .= ' '.Linker::generateRollback( $rev );
                        }
                }
                # Is there a visible previous revision?
-               if( !$rev->isDeleted( Revision::DELETED_TEXT ) && $rev->getParentId() !== 0 ) {
-                       $difftext = $this->messages['pipe-separator'] . $sk->linkKnown(
+               if( $rev->userCan( Revision::DELETED_TEXT ) && $rev->getParentId() !== 0 ) {
+                       $difftext = Linker::linkKnown(
                                $page,
                                $this->messages['diff'],
                                array(),
@@ -578,33 +630,43 @@ class ContribsPager extends ReverseChronologicalPager {
                                        'diff' => 'prev',
                                        'oldid' => $row->rev_id
                                )
-                       ) . ')';
+                       );
                } else {
-                       $difftext = $this->messages['pipe-separator'] . $this->messages['diff'] . ')';
+                       $difftext = $this->messages['diff'];
                }
-               $histlink = '('.$sk->linkKnown(
+               $histlink = Linker::linkKnown(
                        $page,
                        $this->messages['hist'],
                        array(),
                        array( 'action' => 'history' )
                );
 
-               $comment = $wgContLang->getDirMark() . $sk->revComment( $rev, false, true );
-               $date = $wgLang->timeanddate( wfTimestamp( TS_MW, $row->rev_timestamp ), true );
-               if( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
-                       $d = '<span class="history-deleted">' . $date . '</span>';
+               if ( isset( $this->mParentLens[$row->rev_parent_id] ) ) {
+                       $chardiff = ' . . ' . ChangesList::showCharacterDifference(
+                               $this->mParentLens[$row->rev_parent_id], $row->rev_len ) . ' . . ';
                } else {
-                       $d = $sk->linkKnown(
+                       $chardiff = ' ';
+               }
+
+               $comment = $this->getLang()->getDirMark() . Linker::revComment( $rev, false, true );
+               $date = $this->getLang()->timeanddate( wfTimestamp( TS_MW, $row->rev_timestamp ), true );
+               if( $rev->userCan( Revision::DELETED_TEXT ) ) {
+                       $d = Linker::linkKnown(
                                $page,
                                htmlspecialchars($date),
                                array(),
                                array( 'oldid' => intval( $row->rev_id ) )
                        );
+               } else {
+                       $d = htmlspecialchars( $date );
+               }
+               if( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
+                       $d = '<span class="history-deleted">' . $d . '</span>';
                }
 
                if( $this->target == 'newbies' ) {
-                       $userlink = ' . . ' . $sk->userLink( $row->rev_user, $row->rev_user_text );
-                       $userlink .= ' ' . wfMsg( 'parentheses', $sk->userTalkLink( $row->rev_user, $row->rev_user_text ) ) . ' ';
+                       $userlink = ' . . ' . Linker::userLink( $row->rev_user, $row->rev_user_text );
+                       $userlink .= ' ' . wfMsg( 'parentheses', Linker::userTalkLink( $row->rev_user, $row->rev_user_text ) ) . ' ';
                } else {
                        $userlink = '';
                }
@@ -622,17 +684,17 @@ class ContribsPager extends ReverseChronologicalPager {
                }
 
                // Don't show useless link to people who cannot hide revisions
-               $canHide = $wgUser->isAllowed( 'deleterevision' );
-               if( $canHide || ($rev->getVisibility() && $wgUser->isAllowed('deletedhistory')) ) {
+               $canHide = $this->getUser()->isAllowed( 'deleterevision' );
+               if( $canHide || ($rev->getVisibility() && $this->getUser()->isAllowed('deletedhistory')) ) {
                        if( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) {
-                               $del = $this->mSkin->revDeleteLinkDisabled( $canHide ); // revision was hidden from sysops
+                               $del = Linker::revDeleteLinkDisabled( $canHide ); // revision was hidden from sysops
                        } else {
                                $query = array(
                                        'type'   => 'revision',
                                        'target' => $page->getPrefixedDbkey(),
                                        'ids'    => $rev->getId()
                                );
-                               $del = $this->mSkin->revDeleteLink( $query,
+                               $del = Linker::revDeleteLink( $query,
                                        $rev->isDeleted( Revision::DELETED_RESTRICTED ), $canHide );
                        }
                        $del .= ' ';
@@ -640,11 +702,12 @@ class ContribsPager extends ReverseChronologicalPager {
                        $del = '';
                }
 
-               $ret = "{$del}{$d} {$histlink}{$difftext} {$nflag}{$mflag} {$link}{$userlink} {$comment} {$topmarktext}";
-               
+               $diffHistLinks = '(' . $difftext . $this->messages['pipe-separator'] . $histlink . ')';
+               $ret = "{$del}{$d} {$diffHistLinks}{$chardiff}{$nflag}{$mflag} {$link}{$userlink} {$comment} {$topmarktext}";
+
                # Denote if username is redacted for this edit
-               if( $rev->getVisibility() & Revision::DELETED_USER ) {
-                       $ret .= " <strong>" . wfMsgHtml('rev-deleted-user') . "</strong>";
+               if( $rev->isDeleted( Revision::DELETED_USER ) ) {
+                       $ret .= " <strong>" . wfMsgHtml('rev-deleted-user-contribs') . "</strong>";
                }
 
                # Tags, if any.
@@ -664,10 +727,28 @@ class ContribsPager extends ReverseChronologicalPager {
        /**
         * Get the Database object in use
         *
-        * @return Database
+        * @return DatabaseBase
         */
        public function getDatabase() {
                return $this->mDb;
        }
 
+       /**
+        * Overwrite Pager function and return a helpful comment
+        */
+       function getSqlComment() {
+               if ( $this->namespace || $this->deletedOnly ) {
+                       return 'contributions page filtered for namespace or RevisionDeleted edits'; // potentially slow, see CR r58153
+               } else {
+                       return 'contributions page unfiltered';
+               }
+       }
+
+       protected function preventClickjacking() {
+               $this->preventClickjacking = true;
+       }
+
+       public function getPreventClickjacking() {
+               return $this->preventClickjacking;
+       }
 }