]> scripts.mit.edu Git - autoinstallsdev/mediawiki.git/blobdiff - includes/ChangesList.php
MediaWiki 1.16.0
[autoinstallsdev/mediawiki.git] / includes / ChangesList.php
index 3578d2720137d30907c21cd4bd1b65f66dfda30b..9f092991618834462453b236a3f01ee8da422885 100644 (file)
 <?php
+
 /**
- * @package MediaWiki
+ * @todo document
  */
+class RCCacheEntry extends RecentChange {
+       var $secureName, $link;
+       var $curlink , $difflink, $lastlink, $usertalklink, $versionlink;
+       var $userlink, $timestamp, $watched;
+
+       static function newFromParent( $rc ) {
+               $rc2 = new RCCacheEntry;
+               $rc2->mAttribs = $rc->mAttribs;
+               $rc2->mExtra = $rc->mExtra;
+               return $rc2;
+       }
+}
 
 /**
- * @package MediaWiki
+ * Class to show various lists of changes:
+ * - what links here
+ * - related changes
+ * - recent changes
  */
 class ChangesList {
        # Called by history lists and recent changes
-       #
+       public $skin;
+       protected $watchlist = false;
 
-       /** @todo document */
-       function ChangesList( &$skin ) {
-               $this->skin =& $skin;
+       /**
+       * Changeslist contructor
+       * @param $skin Skin
+       */
+       public function __construct( $skin ) {
+               $this->skin = $skin;
+               $this->preCacheMessages();
        }
 
        /**
-        * Returns the appropiate flags for new page, minor change and patrolling
+        * Fetch an appropriate changes list class for the specified user
+        * Some users might want to use an enhanced list format, for instance
+        *
+        * @param $user User to fetch the list class for
+        * @return ChangesList derivative
         */
-       function recentChangesFlags( $new, $minor, $patrolled, $nothing = '&nbsp;' ) {
-               $f = $new ? '<span class="newpage">' . htmlspecialchars( wfMsg( 'newpageletter' ) ) . '</span>'
-                               : $nothing;
-               $f .= $minor ? '<span class="minor">' . htmlspecialchars( wfMsg( 'minoreditletter' ) ) . '</span>'
-                               : $nothing;
-               $f .= $patrolled ? '<span class="unpatrolled">!</span>' : $nothing;
-               return $f;
-
+       public static function newFromUser( &$user ) {
+               $sk = $user->getSkin();
+               $list = null;
+               if( wfRunHooks( 'FetchChangesList', array( &$user, &$sk, &$list ) ) ) {
+                       return $user->getOption( 'usenewrc' ) ?
+                               new EnhancedChangesList( $sk ) : new OldChangesList( $sk );
+               } else {
+                       return $list;
+               }
        }
-
+       
        /**
-        * Returns text for the start of the tabular part of RC
+        * Sets the list to use a <li class="watchlist-(namespace)-(page)"> tag
+        * @param $value Boolean
         */
-       function beginRecentChangesList() {
-               $this->rc_cache = array() ;
-               $this->rcMoveIndex = 0;
-               $this->rcCacheIndex = 0 ;
-               $this->lastdate = '';
-               $this->rclistOpen = false;
-               return '';
+       public function setWatchlistDivs( $value = true ) {
+               $this->watchlist = $value;
        }
 
        /**
-        * Returns text for the end of RC
-        * If enhanced RC is in use, returns pretty much all the text
+        * As we use the same small set of messages in various methods and that
+        * they are called often, we call them once and save them in $this->message
         */
-       function endRecentChangesList() {
-               $s = $this->recentChangesBlock() ;
-               if( $this->rclistOpen ) {
-                       $s .= "</ul>\n";
+       private function preCacheMessages() {
+               if( !isset( $this->message ) ) {
+                       foreach ( explode( ' ', 'cur diff hist last blocklink history ' .
+                       'semicolon-separator pipe-separator' ) as $msg ) {
+                               $this->message[$msg] = wfMsgExt( $msg, array( 'escapenoentities' ) );
+                       }
                }
-               return $s;
        }
 
+
        /**
-        * Enhanced RC ungrouped line
+        * Returns the appropriate flags for new page, minor change and patrolling
+        * @param $new Boolean
+        * @param $minor Boolean
+        * @param $patrolled Boolean
+        * @param $nothing String to use for empty space
+        * @param $bot Boolean
+        * @return String
         */
-       function recentChangesBlockLine ( $rcObj ) {
-               global $wgStylePath, $wgContLang ;
-
-               # Get rc_xxxx variables
-               extract( $rcObj->mAttribs ) ;
-               $curIdEq = 'curid='.$rc_cur_id;
-
-               # Spacer image
-               $r = '' ;
-
-               $r .= '<img src="'.$wgStylePath.'/common/images/Arr_.png" width="12" height="12" border="0" />' ;
-               $r .= '<tt>' ;
+       protected function recentChangesFlags( $new, $minor, $patrolled, $nothing = '&nbsp;', $bot = false ) {
+               $f = $new ? self::flag( 'newpage' ) : $nothing;
+               $f .= $minor ? self::flag( 'minor' ) : $nothing;
+               $f .= $bot ? self::flag( 'bot' ) : $nothing;
+               $f .= $patrolled ? self::flag( 'unpatrolled' ) : $nothing;
+               return $f;
+       }
 
-               if ( $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) {
-                       $r .= '&nbsp;&nbsp;&nbsp;';
+       /**
+        * Provide the <abbr> element appropriate to a given abbreviated flag,
+        * namely the flag indicating a new page, a minor edit, a bot edit, or an
+        * unpatrolled edit.  By default in English it will contain "N", "m", "b",
+        * "!" respectively, plus it will have an appropriate title and class.
+        *
+        * @param $key String: 'newpage', 'unpatrolled', 'minor', or 'bot'
+        * @return String: Raw HTML
+        */
+       public static function flag( $key ) {
+               static $messages = null;
+               if ( is_null( $messages ) ) {
+                       foreach ( explode( ' ', 'minoreditletter boteditletter newpageletter ' .
+                       'unpatrolledletter recentchanges-label-minor recentchanges-label-bot ' .
+                       'recentchanges-label-newpage recentchanges-label-unpatrolled' ) as $msg ) {
+                               $messages[$msg] = wfMsgExt( $msg, 'escapenoentities' );
+                       }
+               }
+               # Inconsistent naming, bleh
+               if ( $key == 'newpage' || $key == 'unpatrolled' ) {
+                       $key2 = $key;
                } else {
-                       $r .= $this->recentChangesFlags( $rc_type == RC_NEW, $rc_minor, $rcObj->unpatrolled );
+                       $key2 = $key . 'edit';
                }
+               return "<abbr class=\"$key\" title=\""
+                       . $messages["recentchanges-label-$key"] . "\">"
+                       . $messages["${key2}letter"]
+                       . '</abbr>';
+       }
 
-               # Timestamp
-               $r .= ' '.$rcObj->timestamp.' ' ;
-               $r .= '</tt>' ;
-
-               # Article link
-               $link = $rcObj->link ;
-               if ( $rcObj->watched ) $link = '<strong>'.$link.'</strong>' ;
-               $r .= $link ;
-
-               # Diff
-               $r .= ' (' ;
-               $r .= $rcObj->difflink ;
-               $r .= '; ' ;
+       /**
+        * Some explanatory wrapper text for the given flag, to be used in a legend
+        * explaining what the flags mean.  For instance, "N - new page".  See
+        * also flag().
+        *
+        * @param $key String: 'newpage', 'unpatrolled', 'minor', or 'bot'
+        * @return String: Raw HTML
+        */
+       private static function flagLine( $key ) {
+               return wfMsgExt( "recentchanges-legend-$key", array( 'escapenoentities',
+                       'replaceafter' ), self::flag( $key ) );
+       }
 
-               # Hist
-               $r .= $this->skin->makeKnownLinkObj( $rcObj->getTitle(), wfMsg( 'hist' ), $curIdEq.'&action=history' );
+       /**
+        * A handy legend to tell users what the little "m", "b", and so on mean.
+        *
+        * @return String: Raw HTML
+        */
+       public static function flagLegend() {
+               global $wgGroupPermissions, $wgLang;
 
-               # User/talk
-               $r .= ') . . '.$rcObj->userlink ;
-               $r .= $rcObj->usertalklink ;
+               $flags = array( self::flagLine( 'newpage' ),
+                       self::flagLine( 'minor' ) );
 
-               # Comment
-                if ( $rc_type != RC_MOVE && $rc_type != RC_MOVE_OVER_REDIRECT ) {
-                       $r .= $this->skin->commentBlock( $rc_comment, $rcObj->getTitle() );
+               # Don't show info on bot edits unless there's a bot group of some kind
+               foreach ( $wgGroupPermissions as $rights ) {
+                       if ( isset( $rights['bot'] ) && $rights['bot'] ) {
+                               $flags[] = self::flagLine( 'bot' );
+                               break;
+                       }
                }
 
-               if ($rcObj->numberofWatchingusers > 0) {
-                       $r .= wfMsg('number_of_watching_users_RCview',  $wgContLang->formatNum($rcObj->numberofWatchingusers));
+               if ( self::usePatrol() ) {
+                       $flags[] = self::flagLine( 'unpatrolled' );
                }
 
-               $r .= "<br />\n" ;
-               return $r ;
+               return '<div class="mw-rc-label-legend">' .
+                       wfMsgExt( 'recentchanges-label-legend', 'parseinline',
+                       $wgLang->commaList( $flags ) ) . '</div>';
        }
 
        /**
-        * Enhanced RC group
+        * Returns text for the start of the tabular part of RC
+        * @return String
+        */
+       public function beginRecentChangesList() {
+               $this->rc_cache = array();
+               $this->rcMoveIndex = 0;
+               $this->rcCacheIndex = 0;
+               $this->lastdate = '';
+               $this->rclistOpen = false;
+               return '';
+       }
+       
+       /**
+        * Show formatted char difference
+        * @param $old Integer: bytes
+        * @param $new Integer: bytes
+        * @returns String
         */
-       function recentChangesBlockGroup ( $block ) {
-               global $wgStylePath, $wgContLang ;
+       public static function showCharacterDifference( $old, $new ) {
+               global $wgRCChangedSizeThreshold, $wgLang, $wgMiserMode;
+               $szdiff = $new - $old;
+
+               $code = $wgLang->getCode();
+               static $fastCharDiff = array();
+               if ( !isset($fastCharDiff[$code]) ) {
+                       $fastCharDiff[$code] = $wgMiserMode || wfMsgNoTrans( 'rc-change-size' ) === '$1';
+               }
+                       
+               $formatedSize = $wgLang->formatNum($szdiff);
 
-               $r = '';
+               if ( !$fastCharDiff[$code] ) {
+                       $formatedSize = wfMsgExt( 'rc-change-size', array( 'parsemag', 'escape' ), $formatedSize );
+               }
+                       
+               if( abs( $szdiff ) > abs( $wgRCChangedSizeThreshold ) ) {
+                       $tag = 'strong';
+               } else {
+                   $tag = 'span';
+               }
+               if( $szdiff === 0 ) {
+                       return "<$tag class='mw-plusminus-null'>($formatedSize)</$tag>";
+               } elseif( $szdiff > 0 ) {
+                       return "<$tag class='mw-plusminus-pos'>(+$formatedSize)</$tag>";
+           } else {
+                       return "<$tag class='mw-plusminus-neg'>($formatedSize)</$tag>";
+               }
+       }
 
-               # Collate list of users
-               $isnew = false ;
-               $unpatrolled = false;
-               $userlinks = array () ;
-               foreach ( $block AS $rcObj ) {
-                       $oldid = $rcObj->mAttribs['rc_last_oldid'];
-                       $newid = $rcObj->mAttribs['rc_this_oldid'];
-                       if ( $rcObj->mAttribs['rc_new'] ) {
-                               $isnew = true ;
-                       }
-                       $u = $rcObj->userlink ;
-                       if ( !isset ( $userlinks[$u] ) ) {
-                               $userlinks[$u] = 0 ;
-                       }
-                       if ( $rcObj->unpatrolled ) {
-                               $unpatrolled = true;
-                       }
-                       $userlinks[$u]++ ;
+       /**
+        * Returns text for the end of RC
+        * @return String
+        */
+       public function endRecentChangesList() {
+               if( $this->rclistOpen ) {
+                       return "</ul>\n";
+               } else {
+                       return '';
                }
+       }
 
-               # Sort the list and convert to text
-               krsort ( $userlinks ) ;
-               asort ( $userlinks ) ;
-               $users = array () ;
-               foreach ( $userlinks as $userlink => $count) {
-                       $text = $userlink ;
-                       if ( $count > 1 ) $text .= " ({$count}&times;)" ;
-                       array_push ( $users , $text ) ;
-               }
-               $users = ' <span class="changedby">['.implode('; ',$users).']</span>';
-
-               # Arrow
-               $rci = 'RCI'.$this->rcCacheIndex ;
-               $rcl = 'RCL'.$this->rcCacheIndex ;
-               $rcm = 'RCM'.$this->rcCacheIndex ;
-               $toggleLink = "javascript:toggleVisibility('$rci','$rcm','$rcl')" ;
-               $arrowdir = $wgContLang->isRTL() ? 'l' : 'r';
-               $tl  = '<span id="'.$rcm.'"><a href="'.$toggleLink.'"><img src="'.$wgStylePath.'/common/images/Arr_'.$arrowdir.'.png" width="12" height="12" alt="+" /></a></span>' ;
-               $tl .= '<span id="'.$rcl.'" style="display:none"><a href="'.$toggleLink.'"><img src="'.$wgStylePath.'/common/images/Arr_d.png" width="12" height="12" alt="-" /></a></span>' ;
-               $r .= $tl ;
+       public function insertMove( &$s, $rc ) {
+               # Diff
+               $s .= '(' . $this->message['diff'] . ') (';
+               # Hist
+               $s .= $this->skin->link(
+                       $rc->getMovedToTitle(),
+                       $this->message['hist'],
+                       array(),
+                       array( 'action' => 'history' ),
+                       array( 'known', 'noclasses' )
+               ) . ') . . ';
+               # "[[x]] moved to [[y]]"
+               $msg = ( $rc->mAttribs['rc_type'] == RC_MOVE ) ? '1movedto2' : '1movedto2_redir';
+               $s .= wfMsg(
+                       $msg,
+                       $this->skin->link(
+                               $rc->getTitle(),
+                               null,
+                               array(),
+                               array( 'redirect' => 'no' ),
+                               array( 'known', 'noclasses' )
+                       ),
+                       $this->skin->link(
+                               $rc->getMovedToTitle(),
+                               null,
+                               array(),
+                               array(),
+                               array( 'known', 'noclasses' )
+                       )
+               );
+       }
 
-               # Main line
+       public function insertDateHeader( &$s, $rc_timestamp ) {
+               global $wgLang;
+               # Make date header if necessary
+               $date = $wgLang->date( $rc_timestamp, true, true );
+               if( $date != $this->lastdate ) {
+                       if( $this->lastdate != '' ) {
+                               $s .= "</ul>\n";
+                       }
+                       $s .= Xml::element( 'h4', null, $date ) . "\n<ul class=\"special\">";
+                       $this->lastdate = $date;
+                       $this->rclistOpen = true;
+               }
+       }
 
-               $r .= '<tt>' ;
-               $r .= $this->recentChangesFlags( $isnew, false, $unpatrolled );
+       public function insertLog( &$s, $title, $logtype ) {
+               $logname = LogPage::logName( $logtype );
+               $s .= '(' . $this->skin->link(
+                       $title,
+                       $logname,
+                       array(),
+                       array(),
+                       array( 'known', 'noclasses' )
+               ) . ')';
+       }
 
-               # Timestamp
-               $r .= ' '.$block[0]->timestamp.' ' ;
-               $r .= '</tt>' ;
+       public function insertDiffHist( &$s, &$rc, $unpatrolled ) {
+               # Diff link
+               if( $rc->mAttribs['rc_type'] == RC_NEW || $rc->mAttribs['rc_type'] == RC_LOG ) {
+                       $diffLink = $this->message['diff'];
+               } else if( !self::userCan($rc,Revision::DELETED_TEXT) ) {
+                       $diffLink = $this->message['diff'];
+               } else {
+                       $query = array(
+                               'curid' => $rc->mAttribs['rc_cur_id'],
+                               'diff'  => $rc->mAttribs['rc_this_oldid'],
+                               'oldid' => $rc->mAttribs['rc_last_oldid']
+                       );
+
+                       if( $unpatrolled ) {
+                               $query['rcid'] = $rc->mAttribs['rc_id'];
+                       };
+
+                       $diffLink = $this->skin->link(
+                               $rc->getTitle(),
+                               $this->message['diff'],
+                               array( 'tabindex' => $rc->counter ),
+                               $query,
+                               array( 'known', 'noclasses' )
+                       );
+               }
+               $s .= '(' . $diffLink . $this->message['pipe-separator'];
+               # History link
+               $s .= $this->skin->link(
+                       $rc->getTitle(),
+                       $this->message['hist'],
+                       array(),
+                       array(
+                               'curid' => $rc->mAttribs['rc_cur_id'],
+                               'action' => 'history'
+                       ),
+                       array( 'known', 'noclasses' )
+               );
+               $s .= ') . . ';
+       }
 
-               # Article link
-               $link = $block[0]->link ;
-               if ( $block[0]->watched ) $link = '<strong>'.$link.'</strong>' ;
-               $r .= $link ;
+       public function insertArticleLink( &$s, &$rc, $unpatrolled, $watched ) {
+               global $wgContLang;
+               # If it's a new article, there is no diff link, but if it hasn't been
+               # patrolled yet, we need to give users a way to do so
+               $params = array();
 
-               $curIdEq = 'curid=' . $block[0]->mAttribs['rc_cur_id'];
-               $currentRevision = $block[0]->mAttribs['rc_this_oldid'];
-               if ( $block[0]->mAttribs['rc_type'] != RC_LOG ) {
-                       # Changes
-                       $r .= ' ('.count($block).' ' ;
-                       if ( $isnew ) $r .= wfMsg('changes');
-                       else $r .= $this->skin->makeKnownLinkObj( $block[0]->getTitle() , wfMsg('changes') ,
-                               $curIdEq."&diff=$currentRevision&oldid=$oldid" ) ;
-                       $r .= '; ' ;
+               if ( $unpatrolled && $rc->mAttribs['rc_type'] == RC_NEW ) {
+                       $params['rcid'] = $rc->mAttribs['rc_id'];
+               }
 
-                       # History
-                       $r .= $this->skin->makeKnownLinkObj( $block[0]->getTitle(), wfMsg( 'history' ), $curIdEq.'&action=history' );
-                       $r .= ')' ;
+               if( $this->isDeleted($rc,Revision::DELETED_TEXT) ) {
+                       $articlelink = $this->skin->link(
+                               $rc->getTitle(),
+                               null,
+                               array(),
+                               $params,
+                               array( 'known', 'noclasses' )
+                       );
+                       $articlelink = '<span class="history-deleted">' . $articlelink . '</span>';
+               } else {
+                       $articlelink = ' '. $this->skin->link(
+                               $rc->getTitle(),
+                               null,
+                               array(),
+                               $params,
+                               array( 'known', 'noclasses' )
+                       );
                }
+               # Bolden pages watched by this user
+               if( $watched ) {
+                       $articlelink = "<strong class=\"mw-watched\">{$articlelink}</strong>";
+               }
+               # RTL/LTR marker
+               $articlelink .= $wgContLang->getDirMark();
 
-               $r .= $users ;
+               wfRunHooks( 'ChangesListInsertArticleLink',
+                       array(&$this, &$articlelink, &$s, &$rc, $unpatrolled, $watched) );
 
-               if ($block[0]->numberofWatchingusers > 0) {
-                       $r .= wfMsg('number_of_watching_users_RCview',  $wgContLang->formatNum($block[0]->numberofWatchingusers));
-               }
-               $r .= "<br />\n" ;
+               $s .= " $articlelink";
+       }
 
-               # Sub-entries
-               $r .= '<div id="'.$rci.'" style="display:none">' ;
-               foreach ( $block AS $rcObj ) {
-                       # Get rc_xxxx variables
-                       extract( $rcObj->mAttribs );
+       public function insertTimestamp( &$s, $rc ) {
+               global $wgLang;
+               $s .= $this->message['semicolon-separator'] . 
+                       $wgLang->time( $rc->mAttribs['rc_timestamp'], true, true ) . ' . . ';
+       }
 
-                       $r .= '<img src="'.$wgStylePath.'/common/images/Arr_.png" width="12" height="12" />';
-                       $r .= '<tt>&nbsp; &nbsp; &nbsp; &nbsp;' ;
-                       $r .= $this->recentChangesFlags( $rc_new, $rc_minor, $rcObj->unpatrolled );
-                       $r .= '&nbsp;</tt>' ;
+       /** Insert links to user page, user talk page and eventually a blocking link */
+       public function insertUserRelatedLinks( &$s, &$rc ) {
+               if( $this->isDeleted( $rc, Revision::DELETED_USER ) ) {
+                  $s .= ' <span class="history-deleted">' . wfMsgHtml( 'rev-deleted-user' ) . '</span>';
+               } else {
+                 $s .= $this->skin->userLink( $rc->mAttribs['rc_user'], $rc->mAttribs['rc_user_text'] );
+                 $s .= $this->skin->userToolLinks( $rc->mAttribs['rc_user'], $rc->mAttribs['rc_user_text'] );
+               }
+       }
 
-                       $o = '' ;
-                       if ( $rc_this_oldid != 0 ) {
-                               $o = 'oldid='.$rc_this_oldid ;
-                       }
-                       if ( $rc_type == RC_LOG ) {
-                               $link = $rcObj->timestamp ;
+       /** insert a formatted action */
+       public function insertAction( &$s, &$rc ) {
+               if( $rc->mAttribs['rc_type'] == RC_LOG ) {
+                       if( $this->isDeleted( $rc, LogPage::DELETED_ACTION ) ) {
+                               $s .= ' <span class="history-deleted">' . wfMsgHtml( 'rev-deleted-event' ) . '</span>';
                        } else {
-                               $link = $this->skin->makeKnownLinkObj( $rcObj->getTitle(), $rcObj->timestamp , "{$curIdEq}&$o" ) ;
+                               $s .= ' '.LogPage::actionText( $rc->mAttribs['rc_log_type'], $rc->mAttribs['rc_log_action'],
+                                       $rc->getTitle(), $this->skin, LogPage::extractParams( $rc->mAttribs['rc_params'] ), true, true );
                        }
-                       $link = '<tt>'.$link.'</tt>' ;
-
-                       $r .= $link ;
-                       $r .= ' (' ;
-                       $r .= $rcObj->curlink ;
-                       $r .= '; ' ;
-                       $r .= $rcObj->lastlink ;
-                       $r .= ') . . '.$rcObj->userlink ;
-                       $r .= $rcObj->usertalklink ;
-                       $r .= $this->skin->commentBlock( $rc_comment, $rcObj->getTitle() );
-                       $r .= "<br />\n" ;
                }
-               $r .= "</div>\n" ;
-
-               $this->rcCacheIndex++ ;
-               return $r ;
        }
 
-       /**
-        * If enhanced RC is in use, this function takes the previously cached
-        * RC lines, arranges them, and outputs the HTML
-        */
-       function recentChangesBlock () {
-               global $wgStylePath ;
-               if ( count ( $this->rc_cache ) == 0 ) return '' ;
-               $blockOut = '';
-               foreach ( $this->rc_cache AS $secureName => $block ) {
-                       if ( count ( $block ) < 2 ) {
-                               $blockOut .= $this->recentChangesBlockLine ( array_shift ( $block ) ) ;
+       /** insert a formatted comment */
+       public function insertComment( &$s, &$rc ) {
+               if( $rc->mAttribs['rc_type'] != RC_MOVE && $rc->mAttribs['rc_type'] != RC_MOVE_OVER_REDIRECT ) {
+                       if( $this->isDeleted( $rc, Revision::DELETED_COMMENT ) ) {
+                               $s .= ' <span class="history-deleted">' . wfMsgHtml( 'rev-deleted-comment' ) . '</span>';
                        } else {
-                               $blockOut .= $this->recentChangesBlockGroup ( $block ) ;
+                               $s .= $this->skin->commentBlock( $rc->mAttribs['rc_comment'], $rc->getTitle() );
                        }
                }
-
-               return '<div>'.$blockOut.'</div>' ;
        }
 
        /**
-        * Called in a loop over all displayed RC entries
-        * Either returns the line, or caches it for later use
+        * Check whether to enable recent changes patrol features
+        * @return Boolean
         */
-       function recentChangesLine( &$rc, $watched = false ) {
+       public static function usePatrol() {
                global $wgUser;
-               $usenew = $wgUser->getOption( 'usenewrc' );
-               if ( $usenew )
-                       $line = $this->recentChangesLineNew ( $rc, $watched ) ;
-               else
-                       $line = $this->recentChangesLineOld ( $rc, $watched ) ;
-               return $line ;
+               return $wgUser->useRCPatrol();
        }
 
-
-       function recentChangesLineOld( &$rc, $watched = false ) {
-               global $wgTitle, $wgLang, $wgContLang, $wgUser, $wgUseRCPatrol,
-                       $wgOnlySysopsCanPatrol, $wgSysopUserBans;
-
-               $fname = 'Skin::recentChangesLineOld';
-               wfProfileIn( $fname );
-
-               static $message;
-               if( !isset( $message ) ) {
-                       foreach( explode(' ', 'diff hist minoreditletter newpageletter blocklink' ) as $msg ) {
-                               $message[$msg] = wfMsg( $msg );
+       /**
+        * Returns the string which indicates the number of watching users
+        */
+       protected function numberofWatchingusers( $count ) {
+               global $wgLang;
+               static $cache = array();
+               if( $count > 0 ) {
+                       if( !isset( $cache[$count] ) ) {
+                               $cache[$count] = wfMsgExt( 'number_of_watching_users_RCview',
+                                       array('parsemag', 'escape' ), $wgLang->formatNum( $count ) );
                        }
+                       return $cache[$count];
+               } else {
+                       return '';
                }
+       }
 
-               # Extract DB fields into local scope
-               extract( $rc->mAttribs );
-               $curIdEq = 'curid=' . $rc_cur_id;
-
-               # Should patrol-related stuff be shown?
-               $unpatrolled = $wgUseRCPatrol && $wgUser->isLoggedIn() &&
-                 ( !$wgOnlySysopsCanPatrol || $wgUser->isAllowed('patrol') ) && $rc_patrolled == 0;
+       /**
+        * Determine if said field of a revision is hidden
+        * @param $rc RCCacheEntry
+        * @param $field Integer: one of DELETED_* bitfield constants
+        * @return Boolean
+        */
+       public static function isDeleted( $rc, $field ) {
+               return ( $rc->mAttribs['rc_deleted'] & $field ) == $field;
+       }
 
-               # Make date header if necessary
-               $date = $wgLang->date( $rc_timestamp, true, true );
-               $s = '';
-               if ( $date != $this->lastdate ) {
-                       if ( '' != $this->lastdate ) { $s .= "</ul>\n"; }
-                       $s .= "<h4>{$date}</h4>\n<ul class=\"special\">";
-                       $this->lastdate = $date;
-                       $this->rclistOpen = true;
+       /**
+        * Determine if the current user is allowed to view a particular
+        * field of this revision, if it's marked as deleted.
+        * @param $rc RCCacheEntry
+        * @param $field Integer
+        * @return Boolean
+        */
+       public static function userCan( $rc, $field ) {
+               if( $rc->mAttribs['rc_type'] == RC_LOG ) {
+                       return LogEventsList::userCanBitfield( $rc->mAttribs['rc_deleted'], $field );
+               } else {
+                       return Revision::userCanBitfield( $rc->mAttribs['rc_deleted'], $field );
                }
+       }
 
-               $s .= '<li>';
-
-               if ( $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) {
-                       # Diff
-                       $s .= '(' . $message['diff'] . ') (';
-                       # Hist
-                       $s .= $this->skin->makeKnownLinkObj( $rc->getMovedToTitle(), $message['hist'], 'action=history' ) .
-                               ') . . ';
-
-                       # "[[x]] moved to [[y]]"
-                       $msg = ( $rc_type == RC_MOVE ) ? '1movedto2' : '1movedto2_redir';
-                       $s .= wfMsg( $msg, $this->skin->makeKnownLinkObj( $rc->getTitle(), '', 'redirect=no' ),
-                               $this->skin->makeKnownLinkObj( $rc->getMovedToTitle(), '' ) );
-               } elseif( $rc_namespace == NS_SPECIAL && preg_match( '!^Log/(.*)$!', $rc_title, $matches ) ) {
-                       # Log updates, etc
-                       $logtype = $matches[1];
-                       $logname = LogPage::logName( $logtype );
-                       $s .= '(' . $this->skin->makeKnownLinkObj( $rc->getTitle(), $logname ) . ')';
+       protected function maybeWatchedLink( $link, $watched = false ) {
+               if( $watched ) {
+                       return '<strong class="mw-watched">' . $link . '</strong>';
                } else {
-                       wfProfileIn("$fname-page");
-                       # Diff link
-                       if ( $rc_type == RC_NEW || $rc_type == RC_LOG ) {
-                               $diffLink = $message['diff'];
-                       } else {
-                               if ( $unpatrolled )
-                                       $rcidparam = "&rcid={$rc_id}";
-                               else
-                                       $rcidparam = "";
-                               $diffLink = $this->skin->makeKnownLinkObj( $rc->getTitle(), $message['diff'],
-                                 "{$curIdEq}&diff={$rc_this_oldid}&oldid={$rc_last_oldid}{$rcidparam}",
-                                 '', '', ' tabindex="'.$rc->counter.'"');
+                       return '<span class="mw-rc-unwatched">' . $link . '</span>';
+               }
+       }
+       
+       /** Inserts a rollback link */
+       public function insertRollback( &$s, &$rc ) {
+               global $wgUser;
+               if( !$rc->mAttribs['rc_new'] && $rc->mAttribs['rc_this_oldid'] && $rc->mAttribs['rc_cur_id'] ) {
+                       $page = $rc->getTitle();
+                       /** Check for rollback and edit permissions, disallow special pages, and only
+                         * show a link on the top-most revision */
+                       if ($wgUser->isAllowed('rollback') && $rc->mAttribs['page_latest'] == $rc->mAttribs['rc_this_oldid'] )
+                       {
+                               $rev = new Revision( array(
+                                       'id'        => $rc->mAttribs['rc_this_oldid'],
+                                       'user'      => $rc->mAttribs['rc_user'],
+                                       'user_text' => $rc->mAttribs['rc_user_text'],
+                                       'deleted'   => $rc->mAttribs['rc_deleted']
+                               ) );
+                               $rev->setTitle( $page );
+                               $s .= ' '.$this->skin->generateRollback( $rev );
                        }
-                       $s .= '('.$diffLink.') (';
+               }
+       }
 
-                       # History link
-                       $s .= $this->skin->makeKnownLinkObj( $rc->getTitle(), $message['hist'], $curIdEq.'&action=history' );
-                       $s .= ') . . ';
+       public function insertTags( &$s, &$rc, &$classes ) {
+               if ( empty($rc->mAttribs['ts_tags']) )
+                       return;
+                       
+               list($tagSummary, $newClasses) = ChangeTags::formatSummaryRow( $rc->mAttribs['ts_tags'], 'changeslist' );
+               $classes = array_merge( $classes, $newClasses );
+               $s .= ' ' . $tagSummary;
+       }
 
-                       # M, N and ! (minor, new and unpatrolled)
-                       $s .= ' ' . $this->recentChangesFlags( $rc_type == RC_NEW, $rc_minor, $unpatrolled, '' );
+       public function insertExtra( &$s, &$rc, &$classes ) {
+               ## Empty, used for subclassers to add anything special.
+       }
+}
 
-                       # Article link
-                       # If it's a new article, there is no diff link, but if it hasn't been
-                       # patrolled yet, we need to give users a way to do so
-                       if ( $unpatrolled && $rc_type == RC_NEW )
-                               $articleLink = $this->skin->makeKnownLinkObj( $rc->getTitle(), '', "rcid={$rc_id}" );
-                       else
-                               $articleLink = $this->skin->makeKnownLinkObj( $rc->getTitle(), '' );
 
-                       if ( $watched ) {
-                               $articleLink = '<strong>'.$articleLink.'</strong>';
-                       }
-
-                       $s .= ' '.$articleLink;
-                       wfProfileOut("$fname-page");
-               }
+/**
+ * Generate a list of changes using the good old system (no javascript)
+ */
+class OldChangesList extends ChangesList {
+       /**
+        * Format a line using the old system (aka without any javascript).
+        */
+       public function recentChangesLine( &$rc, $watched = false, $linenumber = null ) {
+               global $wgLang, $wgRCShowChangedSize, $wgUser;
+               wfProfileIn( __METHOD__ );
+               # Should patrol-related stuff be shown?
+               $unpatrolled = $wgUser->useRCPatrol() && !$rc->mAttribs['rc_patrolled'];
 
-               wfProfileIn( "$fname-rest" );
-               # Timestamp
-               $s .= '; ' . $wgLang->time( $rc_timestamp, true, true ) . ' . . ';
+               $dateheader = ''; // $s now contains only <li>...</li>, for hooks' convenience.
+               $this->insertDateHeader( $dateheader, $rc->mAttribs['rc_timestamp'] );
 
-               # User link (or contributions for unregistered users)
-               if ( 0 == $rc_user ) {
-                       $contribsPage =& Title::makeTitle( NS_SPECIAL, 'Contributions' );
-                       $userLink = $this->skin->makeKnownLinkObj( $contribsPage,
-                               $rc_user_text, 'target=' . $rc_user_text );
-               } else {
-                       $userPage =& Title::makeTitle( NS_USER, $rc_user_text );
-                       $userLink = $this->skin->makeLinkObj( $userPage, htmlspecialchars( $rc_user_text ) );
+               $s = '';
+               $classes = array();
+               // use mw-line-even/mw-line-odd class only if linenumber is given (feature from bug 14468)
+               if( $linenumber ) {
+                       if( $linenumber & 1 ) {
+                               $classes[] = 'mw-line-odd';
+                       }
+                       else {
+                               $classes[] = 'mw-line-even';
+                       }
                }
-               $s .= $userLink;
 
-               # User talk link
-               $talkname = $wgContLang->getNsText(NS_TALK); # use the shorter name
-               global $wgDisableAnonTalk;
-               if( 0 == $rc_user && $wgDisableAnonTalk ) {
-                       $userTalkLink = '';
+               // Moved pages
+               if( $rc->mAttribs['rc_type'] == RC_MOVE || $rc->mAttribs['rc_type'] == RC_MOVE_OVER_REDIRECT ) {
+                       $this->insertMove( $s, $rc );
+               // Log entries
+               } elseif( $rc->mAttribs['rc_log_type'] ) {
+                       $logtitle = Title::newFromText( 'Log/'.$rc->mAttribs['rc_log_type'], NS_SPECIAL );
+                       $this->insertLog( $s, $logtitle, $rc->mAttribs['rc_log_type'] );
+               // Log entries (old format) or log targets, and special pages
+               } elseif( $rc->mAttribs['rc_namespace'] == NS_SPECIAL ) {
+                       list( $name, $subpage ) = SpecialPage::resolveAliasWithSubpage( $rc->mAttribs['rc_title'] );
+                       if( $name == 'Log' ) {
+                               $this->insertLog( $s, $rc->getTitle(), $subpage );
+                       }
+               // Regular entries
                } else {
-                       $userTalkPage =& Title::makeTitle( NS_USER_TALK, $rc_user_text );
-                       $userTalkLink= $this->skin->makeLinkObj( $userTalkPage, htmlspecialchars( $talkname ) );
-               }
-               # Block link
-               $blockLink='';
-               if ( ( $wgSysopUserBans || 0 == $rc_user ) && $wgUser->isAllowed('block') ) {
-                       $blockLinkPage = Title::makeTitle( NS_SPECIAL, 'Blockip' );
-                       $blockLink = $this->skin->makeKnownLinkObj( $blockLinkPage,
-                               htmlspecialchars( $message['blocklink'] ), 'ip=' . urlencode( $rc_user_text ) );
-
+                       $this->insertDiffHist( $s, $rc, $unpatrolled );
+                       # M, N, b and ! (minor, new, bot and unpatrolled)
+                       $s .= $this->recentChangesFlags( $rc->mAttribs['rc_new'], $rc->mAttribs['rc_minor'],
+                               $unpatrolled, '', $rc->mAttribs['rc_bot'] );
+                       $this->insertArticleLink( $s, $rc, $unpatrolled, $watched );
                }
-               if($blockLink) {
-                       if($userTalkLink) $userTalkLink .= ' | ';
-                       $userTalkLink .= $blockLink;
+               # Edit/log timestamp
+               $this->insertTimestamp( $s, $rc );
+               # Bytes added or removed
+               if( $wgRCShowChangedSize ) {
+                       $cd = $rc->getCharacterDifference();
+                       if( $cd != '' ) {
+                               $s .= "$cd  . . ";
+                       }
                }
-               if($userTalkLink) $s.=' ('.$userTalkLink.')';
-
-               # Add comment
-               if ( $rc_type != RC_MOVE && $rc_type != RC_MOVE_OVER_REDIRECT ) {
-                       $s .= $this->skin->commentBlock( $rc_comment, $rc->getTitle() );
+               # User tool links
+               $this->insertUserRelatedLinks( $s, $rc );
+               # Log action text (if any)
+               $this->insertAction( $s, $rc );
+               # Edit or log comment
+               $this->insertComment( $s, $rc );
+               # Tags
+               $this->insertTags( $s, $rc, $classes );
+               # Rollback
+               $this->insertRollback( $s, $rc );
+               # For subclasses
+               $this->insertExtra( $s, $rc, $classes );
+               
+               # How many users watch this page
+               if( $rc->numberofWatchingusers > 0 ) {
+                       $s .= ' ' . wfMsgExt( 'number_of_watching_users_RCview', 
+                               array( 'parsemag', 'escape' ), $wgLang->formatNum( $rc->numberofWatchingusers ) );
                }
-
-               if ($rc->numberofWatchingusers > 0) {
-                       $s .= ' ' . wfMsg('number_of_watching_users_RCview',  $wgContLang->formatNum($rc->numberofWatchingusers));
+               
+               if( $this->watchlist ) {
+                       $classes[] = Sanitizer::escapeClass( 'watchlist-'.$rc->mAttribs['rc_namespace'].'-'.$rc->mAttribs['rc_title'] );
                }
+               
+               wfRunHooks( 'OldChangesListRecentChangesLine', array(&$this, &$s, $rc) );
 
-               $s .= "</li>\n";
-
-               wfProfileOut( "$fname-rest" );
-               wfProfileOut( $fname );
-               return $s;
+               wfProfileOut( __METHOD__ );
+               return "$dateheader<li class=\"".implode( ' ', $classes )."\">".$s."</li>\n";
        }
+}
 
-       function recentChangesLineNew( &$baseRC, $watched = false ) {
-               global $wgTitle, $wgLang, $wgContLang, $wgUser,
-                       $wgUseRCPatrol, $wgOnlySysopsCanPatrol, $wgSysopUserBans;
 
-               static $message;
-               if( !isset( $message ) ) {
-                       foreach( explode(' ', 'cur diff hist minoreditletter newpageletter last blocklink' ) as $msg ) {
-                               $message[$msg] = wfMsg( $msg );
-                       }
-               }
+/**
+ * Generate a list of changes using an Enhanced system (uses javascript).
+ */
+class EnhancedChangesList extends ChangesList {
+       /**
+        * Add the JavaScript file for enhanced changeslist
+        * @return String
+        */
+       public function beginRecentChangesList() {
+               global $wgStylePath, $wgStyleVersion;
+               $this->rc_cache = array();
+               $this->rcMoveIndex = 0;
+               $this->rcCacheIndex = 0;
+               $this->lastdate = '';
+               $this->rclistOpen = false;
+               $script = Html::linkedScript( $wgStylePath . "/common/enhancedchanges.js?$wgStyleVersion" );
+               return $script;
+       }
+       /**
+        * Format a line for enhanced recentchange (aka with javascript and block of lines).
+        */
+       public function recentChangesLine( &$baseRC, $watched = false ) {
+               global $wgLang, $wgUser;
+               
+               wfProfileIn( __METHOD__ );
 
                # Create a specialised object
-               $rc = RCCacheEntry::newFromParent( $baseRC ) ;
+               $rc = RCCacheEntry::newFromParent( $baseRC );
 
                # Extract fields from DB into the function scope (rc_xxxx variables)
+               // FIXME: Would be good to replace this extract() call with something
+               // that explicitly initializes variables.
                extract( $rc->mAttribs );
-               $curIdEq = 'curid=' . $rc_cur_id;
+               $curIdEq = array( 'curid' => $rc_cur_id );
 
                # If it's a new day, add the headline and flush the cache
-               $date = $wgLang->date( $rc_timestamp, true);
+               $date = $wgLang->date( $rc_timestamp, true );
                $ret = '';
-               if ( $date != $this->lastdate ) {
+               if( $date != $this->lastdate ) {
                        # Process current cache
-                       $ret = $this->recentChangesBlock () ;
-                       $this->rc_cache = array() ;
-                       $ret .= "<h4>{$date}</h4>\n";
+                       $ret = $this->recentChangesBlock();
+                       $this->rc_cache = array();
+                       $ret .= Xml::element( 'h4', null, $date );
                        $this->lastdate = $date;
                }
 
                # Should patrol-related stuff be shown?
-               if ( $wgUseRCPatrol && $wgUser->isLoggedIn() &&
-                 ( !$wgOnlySysopsCanPatrol || $wgUser->isAllowed('patrol') )) {
+               if( $wgUser->useRCPatrol() ) {
                        $rc->unpatrolled = !$rc_patrolled;
                } else {
                        $rc->unpatrolled = false;
                }
 
+               $showdifflinks = true;
                # Make article link
-               if ( $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) {
+               // Page moves
+               if( $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) {
                        $msg = ( $rc_type == RC_MOVE ) ? "1movedto2" : "1movedto2_redir";
-                       $clink = wfMsg( $msg, $this->skin->makeKnownLinkObj( $rc->getTitle(), '', 'redirect=no' ),
-                         $this->skin->makeKnownLinkObj( $rc->getMovedToTitle(), '' ) );
-               } elseif( $rc_namespace == NS_SPECIAL && preg_match( '!^Log/(.*)$!', $rc_title, $matches ) ) {
-                       # Log updates, etc
-                       $logtype = $matches[1];
-                       $logname = LogPage::logName( $logtype );
-                       $clink = '(' . $this->skin->makeKnownLinkObj( $rc->getTitle(), $logname ) . ')';
-               } elseif ( $rc->unpatrolled && $rc_type == RC_NEW ) {
-                       # Unpatrolled new page, give rc_id in query
-                       $clink = $this->skin->makeKnownLinkObj( $rc->getTitle(), '', "rcid={$rc_id}" );
+                       $clink = wfMsg( $msg, $this->skin->linkKnown( $rc->getTitle(), null,
+                               array(), array( 'redirect' => 'no' ) ),
+                               $this->skin->linkKnown( $rc->getMovedToTitle() ) );
+               // New unpatrolled pages
+               } else if( $rc->unpatrolled && $rc_type == RC_NEW ) {
+                       $clink = $this->skin->linkKnown( $rc->getTitle(), null, array(),
+                               array( 'rcid' => $rc_id ) );
+               // Log entries
+               } else if( $rc_type == RC_LOG ) {
+                       if( $rc_log_type ) {
+                               $logtitle = SpecialPage::getTitleFor( 'Log', $rc_log_type );
+                               $clink = '(' . $this->skin->linkKnown( $logtitle, 
+                                       LogPage::logName($rc_log_type) ) . ')';
+                       } else {
+                               $clink = $this->skin->link( $rc->getTitle() );
+                       }
+                       $watched = false;
+               // Log entries (old format) and special pages
+               } elseif( $rc_namespace == NS_SPECIAL ) {
+                       list( $specialName, $logtype ) = SpecialPage::resolveAliasWithSubpage( $rc_title );
+                       if ( $specialName == 'Log' ) {
+                               # Log updates, etc
+                               $logname = LogPage::logName( $logtype );
+                               $clink = '(' . $this->skin->linkKnown( $rc->getTitle(), $logname ) . ')';
+                       } else {
+                               wfDebug( "Unexpected special page in recentchanges\n" );
+                               $clink = '';
+                       }
+               // Edits
                } else {
-                       $clink = $this->skin->makeKnownLinkObj( $rc->getTitle(), '' ) ;
+                       $clink = $this->skin->linkKnown( $rc->getTitle() );
                }
 
-               $time = $wgContLang->time( $rc_timestamp, true, true );
-               $rc->watched = $watched ;
-               $rc->link = $clink ;
+               # Don't show unusable diff links
+               if ( !ChangesList::userCan($rc,Revision::DELETED_TEXT) ) {
+                       $showdifflinks = false;
+               }
+
+               $time = $wgLang->time( $rc_timestamp, true, true );
+               $rc->watched = $watched;
+               $rc->link = $clink;
                $rc->timestamp = $time;
                $rc->numberofWatchingusers = $baseRC->numberofWatchingusers;
 
-               # Make "cur" and "diff" links
-               $titleObj = $rc->getTitle();
-               if ( $rc->unpatrolled ) {
-                       $rcIdQuery = "&rcid={$rc_id}";
+               # Make "cur" and "diff" links.  Do not use link(), it is too slow if
+               # called too many times (50% of CPU time on RecentChanges!).
+               if( $rc->unpatrolled ) {
+                       $rcIdQuery = array( 'rcid' => $rc_id );
                } else {
-                       $rcIdQuery = '';
+                       $rcIdQuery = array();
                }
-               $querycur = $curIdEq."&diff=0&oldid=$rc_this_oldid";
-               $querydiff = $curIdEq."&diff=$rc_this_oldid&oldid=$rc_last_oldid";
-               $aprops = ' tabindex="'.$baseRC->counter.'"';
-               $curLink = $this->skin->makeKnownLinkObj( $rc->getTitle(), $message['cur'], $querycur, '' ,'' , $aprops );
-               if( $rc_type == RC_NEW || $rc_type == RC_LOG || $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) {
-                       if( $rc_type != RC_NEW ) {
-                               $curLink = $message['cur'];
+               $querycur = $curIdEq + array( 'diff' => '0', 'oldid' => $rc_this_oldid );
+               $querydiff = $curIdEq + array( 'diff' => $rc_this_oldid, 'oldid' =>
+                       $rc_last_oldid ) + $rcIdQuery;
+
+               if( !$showdifflinks ) {
+                       $curLink = $this->message['cur'];
+                       $diffLink = $this->message['diff'];
+               } else if( in_array( $rc_type, array(RC_NEW,RC_LOG,RC_MOVE,RC_MOVE_OVER_REDIRECT) ) ) {
+                       if ( $rc_type != RC_NEW ) {
+                               $curLink = $this->message['cur'];
+                       } else {
+                               $curUrl = htmlspecialchars( $rc->getTitle()->getLinkUrl( $querycur ) );
+                               $curLink = "<a href=\"$curUrl\" tabindex=\"{$baseRC->counter}\">{$this->message['cur']}</a>";
                        }
-                       $diffLink = $message['diff'];
+                       $diffLink = $this->message['diff'];
                } else {
-                       $diffLink = $this->skin->makeKnownLinkObj( $rc->getTitle(), $message['diff'], $querydiff . $rcIdQuery, '' ,'' , $aprops );
+                       $diffUrl = htmlspecialchars( $rc->getTitle()->getLinkUrl( $querydiff ) );
+                       $curUrl = htmlspecialchars( $rc->getTitle()->getLinkUrl( $querycur ) );
+                       $diffLink = "<a href=\"$diffUrl\" tabindex=\"{$baseRC->counter}\">{$this->message['diff']}</a>";
+                       $curLink = "<a href=\"$curUrl\" tabindex=\"{$baseRC->counter}\">{$this->message['cur']}</a>";
                }
 
                # Make "last" link
-               if ( $rc_last_oldid == 0 || $rc_type == RC_LOG || $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) {
-                       $lastLink = $message['last'];
+               if( !$showdifflinks || !$rc_last_oldid ) {
+                       $lastLink = $this->message['last'];
+               } else if( $rc_type == RC_LOG || $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) {
+                       $lastLink = $this->message['last'];
                } else {
-                       $lastLink = $this->skin->makeKnownLinkObj( $rc->getTitle(), $message['last'],
-                         $curIdEq.'&diff='.$rc_this_oldid.'&oldid='.$rc_last_oldid . $rcIdQuery );
+                       $lastLink = $this->skin->linkKnown( $rc->getTitle(), $this->message['last'],
+                               array(), $curIdEq + array('diff' => $rc_this_oldid, 'oldid' => $rc_last_oldid) + $rcIdQuery );
                }
 
-               # Make user link (or user contributions for unregistered users)
-               if ( $rc_user == 0 ) {
-                       $contribsPage =& Title::makeTitle( NS_SPECIAL, 'Contributions' );
-                       $userLink = $this->skin->makeKnownLinkObj( $contribsPage,
-                               $rc_user_text, 'target=' . $rc_user_text );
+               # Make user links
+               if( $this->isDeleted($rc,Revision::DELETED_USER) ) {
+                       $rc->userlink = ' <span class="history-deleted">' . wfMsgHtml( 'rev-deleted-user' ) . '</span>';
                } else {
-                       $userPage =& Title::makeTitle( NS_USER, $rc_user_text );
-                       $userLink = $this->skin->makeLinkObj( $userPage, $rc_user_text );
+                       $rc->userlink = $this->skin->userLink( $rc_user, $rc_user_text );
+                       $rc->usertalklink = $this->skin->userToolLinks( $rc_user, $rc_user_text );
                }
 
-               $rc->userlink = $userLink;
                $rc->lastlink = $lastLink;
                $rc->curlink  = $curLink;
                $rc->difflink = $diffLink;
 
-               # Make user talk link
-               $talkname = $wgContLang->getNsText( NS_TALK ); # use the shorter name
-               $userTalkPage =& Title::makeTitle( NS_USER_TALK, $rc_user_text );
-               $userTalkLink = $this->skin->makeLinkObj( $userTalkPage, $talkname );
-
-               global $wgDisableAnonTalk;
-               if ( ( $wgSysopUserBans || 0 == $rc_user ) && $wgUser->isAllowed('block') ) {
-                       $blockPage =& Title::makeTitle( NS_SPECIAL, 'Blockip' );
-                       $blockLink = $this->skin->makeKnownLinkObj( $blockPage,
-                               $message['blocklink'], 'ip='.$rc_user_text );
-                       if( $wgDisableAnonTalk )
-                               $rc->usertalklink = ' ('.$blockLink.')';
-                       else
-                               $rc->usertalklink = ' ('.$userTalkLink.' | '.$blockLink.')';
-               } else {
-                       if( $wgDisableAnonTalk && ($rc_user == 0) )
-                               $rc->usertalklink = '';
-                       else
-                               $rc->usertalklink = ' ('.$userTalkLink.')';
-               }
-
                # Put accumulated information into the cache, for later display
                # Page moves go on their own line
                $title = $rc->getTitle();
                $secureName = $title->getPrefixedDBkey();
-               if ( $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) {
+               if( $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) {
                        # Use an @ character to prevent collision with page names
                        $this->rc_cache['@@' . ($this->rcMoveIndex++)] = array($rc);
                } else {
-                       if ( !isset ( $this->rc_cache[$secureName] ) ) $this->rc_cache[$secureName] = array() ;
-                       array_push ( $this->rc_cache[$secureName] , $rc ) ;
+                       # Logs are grouped by type
+                       if( $rc_type == RC_LOG ){
+                               $secureName = SpecialPage::getTitleFor( 'Log', $rc_log_type )->getPrefixedDBkey();
+                       }
+                       if( !isset( $this->rc_cache[$secureName] ) ) {
+                               $this->rc_cache[$secureName] = array();
+                       }
+
+                       array_push( $this->rc_cache[$secureName], $rc );
                }
+
+               wfProfileOut( __METHOD__ );
+
                return $ret;
        }
 
+       /**
+        * Enhanced RC group
+        */
+       protected function recentChangesBlockGroup( $block ) {
+               global $wgLang, $wgContLang, $wgRCShowChangedSize;
+
+               wfProfileIn( __METHOD__ );
+
+               $r = '<table class="mw-enhanced-rc"><tr>';
+
+               # Collate list of users
+               $userlinks = array();
+               # Other properties
+               $unpatrolled = false;
+               $isnew = false;
+               $curId = $currentRevision = 0;
+               # Some catalyst variables...
+               $namehidden = true;
+               $allLogs = true;
+               foreach( $block as $rcObj ) {
+                       $oldid = $rcObj->mAttribs['rc_last_oldid'];
+                       if( $rcObj->mAttribs['rc_new'] ) {
+                               $isnew = true;
+                       }
+                       // If all log actions to this page were hidden, then don't
+                       // give the name of the affected page for this block!
+                       if( !$this->isDeleted( $rcObj, LogPage::DELETED_ACTION ) ) {
+                               $namehidden = false;
+                       }
+                       $u = $rcObj->userlink;
+                       if( !isset( $userlinks[$u] ) ) {
+                               $userlinks[$u] = 0;
+                       }
+                       if( $rcObj->unpatrolled ) {
+                               $unpatrolled = true;
+                       }
+                       if( $rcObj->mAttribs['rc_type'] != RC_LOG ) {
+                               $allLogs = false;
+                       }
+                       # Get the latest entry with a page_id and oldid
+                       # since logs may not have these.
+                       if( !$curId && $rcObj->mAttribs['rc_cur_id'] ) {
+                               $curId = $rcObj->mAttribs['rc_cur_id'];
+                       }
+                       if( !$currentRevision && $rcObj->mAttribs['rc_this_oldid'] ) {
+                               $currentRevision = $rcObj->mAttribs['rc_this_oldid'];
+                       }
+
+                       $bot = $rcObj->mAttribs['rc_bot'];
+                       $userlinks[$u]++;
+               }
+
+               # Sort the list and convert to text
+               krsort( $userlinks );
+               asort( $userlinks );
+               $users = array();
+               foreach( $userlinks as $userlink => $count) {
+                       $text = $userlink;
+                       $text .= $wgContLang->getDirMark();
+                       if( $count > 1 ) {
+                               $text .= ' (' . $wgLang->formatNum( $count ) . '×)';
+                       }
+                       array_push( $users, $text );
+               }
+
+               $users = ' <span class="changedby">[' . 
+                       implode( $this->message['semicolon-separator'], $users ) . ']</span>';
+
+               # ID for JS visibility toggle
+               $jsid = $this->rcCacheIndex;
+               # onclick handler to toggle hidden/expanded
+               $toggleLink = "onclick='toggleVisibility($jsid); return false'";
+               # Title for <a> tags
+               $expandTitle = htmlspecialchars( wfMsg( 'rc-enhanced-expand' ) );
+               $closeTitle = htmlspecialchars( wfMsg( 'rc-enhanced-hide' ) );
+
+               $tl = "<span id='mw-rc-openarrow-$jsid' class='mw-changeslist-expanded' style='visibility:hidden'><a href='#' $toggleLink title='$expandTitle'>" . $this->sideArrow() . "</a></span>";
+               $tl .= "<span id='mw-rc-closearrow-$jsid' class='mw-changeslist-hidden' style='display:none'><a href='#' $toggleLink title='$closeTitle'>" . $this->downArrow() . "</a></span>";
+               $r .= '<td class="mw-enhanced-rc">'.$tl.'&nbsp;';
+
+               # Main line
+               $r .= $this->recentChangesFlags( $isnew, false, $unpatrolled, '&nbsp;', $bot );
+
+               # Timestamp
+               $r .= '&nbsp;'.$block[0]->timestamp.'&nbsp;</td><td style="padding:0px;">';
+
+               # Article link
+               if( $namehidden ) {
+                       $r .= ' <span class="history-deleted">' . wfMsgHtml( 'rev-deleted-event' ) . '</span>';
+               } else if( $allLogs ) {
+                       $r .= $this->maybeWatchedLink( $block[0]->link, $block[0]->watched );
+               } else {
+                       $this->insertArticleLink( $r, $block[0], $block[0]->unpatrolled, $block[0]->watched );
+               }
+
+               $r .= $wgContLang->getDirMark();
+
+               $queryParams['curid'] = $curId;
+               # Changes message
+               $n = count($block);
+               static $nchanges = array();
+               if ( !isset( $nchanges[$n] ) ) {
+                       $nchanges[$n] = wfMsgExt( 'nchanges', array( 'parsemag', 'escape' ), $wgLang->formatNum( $n ) );
+               }
+               # Total change link
+               $r .= ' ';
+               if( !$allLogs ) {
+                       $r .= '(';
+                       if( !ChangesList::userCan( $rcObj, Revision::DELETED_TEXT ) ) {
+                               $r .= $nchanges[$n];
+                       } else if( $isnew ) {
+                               $r .= $nchanges[$n];
+                       } else {
+                               $params = $queryParams;
+                               $params['diff'] = $currentRevision;
+                               $params['oldid'] = $oldid;
+                               
+                               $r .= $this->skin->link(
+                                       $block[0]->getTitle(),
+                                       $nchanges[$n],
+                                       array(),
+                                       $params,
+                                       array( 'known', 'noclasses' )
+                               );
+                       }
+               }
+
+               # History
+               if( $allLogs ) {
+                       // don't show history link for logs
+               } else if( $namehidden || !$block[0]->getTitle()->exists() ) {
+                       $r .= $this->message['pipe-separator'] . $this->message['hist'] . ')';
+               } else {
+                       $params = $queryParams;
+                       $params['action'] = 'history';
+
+                       $r .= $this->message['pipe-separator'] .
+                               $this->skin->link(
+                                       $block[0]->getTitle(),
+                                       $this->message['hist'],
+                                       array(),
+                                       $params,
+                                       array( 'known', 'noclasses' )
+                               ) . ')';
+               }
+               $r .= ' . . ';
+
+               # Character difference (does not apply if only log items)
+               if( $wgRCShowChangedSize && !$allLogs ) {
+                       $last = 0;
+                       $first = count($block) - 1;
+                       # Some events (like logs) have an "empty" size, so we need to skip those...
+                       while( $last < $first && $block[$last]->mAttribs['rc_new_len'] === null ) {
+                               $last++;
+                       }
+                       while( $first > $last && $block[$first]->mAttribs['rc_old_len'] === null ) {
+                               $first--;
+                       }
+                       # Get net change
+                       $chardiff = $rcObj->getCharacterDifference( $block[$first]->mAttribs['rc_old_len'],
+                               $block[$last]->mAttribs['rc_new_len'] );
+
+                       if( $chardiff == '' ) {
+                               $r .= ' ';
+                       } else {
+                               $r .= ' ' . $chardiff. ' . . ';
+                       }
+               }
+
+               $r .= $users;
+               $r .= $this->numberofWatchingusers($block[0]->numberofWatchingusers);
+
+               $r .= "</td></tr></table>\n";
+
+               # Sub-entries
+               $r .= '<div id="mw-rc-subentries-'.$jsid.'" class="mw-changeslist-hidden">';
+               $r .= '<table class="mw-enhanced-rc">';
+               foreach( $block as $rcObj ) {
+                       # Extract fields from DB into the function scope (rc_xxxx variables)
+                       // FIXME: Would be good to replace this extract() call with something
+                       // that explicitly initializes variables.
+                       # Classes to apply -- TODO implement
+                       $classes = array();
+                       extract( $rcObj->mAttribs );
+
+                       #$r .= '<tr><td valign="top">'.$this->spacerArrow();
+                       $r .= '<tr><td style="vertical-align:top;font-family:monospace; padding:0px;">';
+                       $r .= $this->spacerIndent() . $this->spacerIndent();
+                       $r .= $this->recentChangesFlags( $rc_new, $rc_minor, $rcObj->unpatrolled, '&nbsp;', $rc_bot );
+                       $r .= '&nbsp;</td><td style="vertical-align:top; padding:0px;"><span style="font-family:monospace">';
+
+                       $params = $queryParams;
+
+                       if( $rc_this_oldid != 0 ) {
+                               $params['oldid'] = $rc_this_oldid;
+                       }
+
+                       # Log timestamp
+                       if( $rc_type == RC_LOG ) {
+                               $link = $rcObj->timestamp;
+                       # Revision link
+                       } else if( !ChangesList::userCan($rcObj,Revision::DELETED_TEXT) ) {
+                               $link = '<span class="history-deleted">'.$rcObj->timestamp.'</span> ';
+                       } else {
+                               if ( $rcObj->unpatrolled && $rc_type == RC_NEW) {
+                                       $params['rcid'] = $rcObj->mAttribs['rc_id'];
+                               }
+
+                               $link = $this->skin->link(
+                                               $rcObj->getTitle(),
+                                               $rcObj->timestamp,
+                                               array(),
+                                               $params,
+                                               array( 'known', 'noclasses' )
+                                       );
+                               if( $this->isDeleted($rcObj,Revision::DELETED_TEXT) )
+                                       $link = '<span class="history-deleted">'.$link.'</span> ';
+                       }
+                       $r .= $link . '</span>';
+
+                       if ( !$rc_type == RC_LOG || $rc_type == RC_NEW ) {
+                               $r .= ' (';
+                               $r .= $rcObj->curlink;
+                               $r .= $this->message['pipe-separator'];
+                               $r .= $rcObj->lastlink;
+                               $r .= ')';
+                       }
+                       $r .= ' . . ';
+
+                       # Character diff
+                       if( $wgRCShowChangedSize ) {
+                               $r .= ( $rcObj->getCharacterDifference() == '' ? '' : $rcObj->getCharacterDifference() . ' . . ' ) ;
+                       }
+                       # User links
+                       $r .= $rcObj->userlink;
+                       $r .= $rcObj->usertalklink;
+                       // log action
+                       $this->insertAction( $r, $rcObj );
+                       // log comment
+                       $this->insertComment( $r, $rcObj );
+                       # Rollback
+                       $this->insertRollback( $r, $rcObj );
+                       # Tags
+                       $this->insertTags( $r, $rcObj, $classes );
+
+                       $r .= "</td></tr>\n";
+               }
+               $r .= "</table></div>\n";
+
+               $this->rcCacheIndex++;
+
+               wfProfileOut( __METHOD__ );
+
+               return $r;
+       }
+
+       /**
+        * Generate HTML for an arrow or placeholder graphic
+        * @param $dir String: one of '', 'd', 'l', 'r'
+        * @param $alt String: text
+        * @param $title String: text
+        * @return String: HTML <img> tag
+        */
+       protected function arrow( $dir, $alt='', $title='' ) {
+               global $wgStylePath;
+               $encUrl = htmlspecialchars( $wgStylePath . '/common/images/Arr_' . $dir . '.png' );
+               $encAlt = htmlspecialchars( $alt );
+               $encTitle = htmlspecialchars( $title );
+               return "<img src=\"$encUrl\" width=\"12\" height=\"12\" alt=\"$encAlt\" title=\"$encTitle\" />";
+       }
+
+       /**
+        * Generate HTML for a right- or left-facing arrow,
+        * depending on language direction.
+        * @return String: HTML <img> tag
+        */
+       protected function sideArrow() {
+               global $wgContLang;
+               $dir = $wgContLang->isRTL() ? 'l' : 'r';
+               return $this->arrow( $dir, '+', wfMsg( 'rc-enhanced-expand' ) );
+       }
+
+       /**
+        * Generate HTML for a down-facing arrow
+        * depending on language direction.
+        * @return String: HTML <img> tag
+        */
+       protected function downArrow() {
+               return $this->arrow( 'd', '-', wfMsg( 'rc-enhanced-hide' ) );
+       }
+
+       /**
+        * Generate HTML for a spacer image
+        * @return String: HTML <img> tag
+        */
+       protected function spacerArrow() {
+               return $this->arrow( '', codepointToUtf8( 0xa0 ) ); // non-breaking space
+       }
+
+       /**
+        * Add a set of spaces
+        * @return String: HTML <td> tag
+        */
+       protected function spacerIndent() {
+               return '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+       }
+
+       /**
+        * Enhanced RC ungrouped line.
+        * @return String: a HTML formated line (generated using $r)
+        */
+       protected function recentChangesBlockLine( $rcObj ) {
+               global $wgRCShowChangedSize;
+
+               wfProfileIn( __METHOD__ );
+
+               # Extract fields from DB into the function scope (rc_xxxx variables)
+               // FIXME: Would be good to replace this extract() call with something
+               // that explicitly initializes variables.
+               $classes = array(); // TODO implement
+               extract( $rcObj->mAttribs );
+               $query['curid'] = $rc_cur_id;
+
+               $r = '<table class="mw-enhanced-rc"><tr>';
+               $r .= '<td class="mw-enhanced-rc">' . $this->spacerArrow() . '&nbsp;';
+               # Flag and Timestamp
+               if( $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) {
+                       $r .= '&nbsp;&nbsp;&nbsp;&nbsp;'; // 4 flags -> 4 spaces
+               } else {
+                       $r .= $this->recentChangesFlags( $rc_type == RC_NEW, $rc_minor, $rcObj->unpatrolled, '&nbsp;', $rc_bot );
+               }
+               $r .= '&nbsp;'.$rcObj->timestamp.'&nbsp;</td><td style="padding:0px;">';
+               # Article or log link
+               if( $rc_log_type ) {
+                       $logtitle = Title::newFromText( "Log/$rc_log_type", NS_SPECIAL );
+                       $logname = LogPage::logName( $rc_log_type );
+                       $r .= '(' . $this->skin->link(
+                               $logtitle,
+                               $logname,
+                               array(),
+                               array(),
+                               array( 'known', 'noclasses' )
+                       ) . ')';
+               } else {
+                       $this->insertArticleLink( $r, $rcObj, $rcObj->unpatrolled, $rcObj->watched );
+               }
+               # Diff and hist links
+               if ( $rc_type != RC_LOG ) {
+                       $r .= ' ('. $rcObj->difflink . $this->message['pipe-separator'];
+                       $query['action'] = 'history';
+                       $r .= $this->skin->link(
+                               $rcObj->getTitle(),
+                               $this->message['hist'],
+                               array(),
+                               $query,
+                               array( 'known', 'noclasses' )
+                       ) . ')';
+               }
+               $r .= ' . . ';
+               # Character diff
+               if( $wgRCShowChangedSize && ($cd = $rcObj->getCharacterDifference()) ) {
+                       $r .= "$cd . . ";
+               }
+               # User/talk
+               $r .= ' '.$rcObj->userlink . $rcObj->usertalklink;
+               # Log action (if any)
+               if( $rc_log_type ) {
+                       if( $this->isDeleted($rcObj,LogPage::DELETED_ACTION) ) {
+                               $r .= ' <span class="history-deleted">' . wfMsgHtml('rev-deleted-event') . '</span>';
+                       } else {
+                               $r .= ' ' . LogPage::actionText( $rc_log_type, $rc_log_action, $rcObj->getTitle(), 
+                                       $this->skin, LogPage::extractParams($rc_params), true, true );
+                       }
+               }
+               $this->insertComment( $r, $rcObj );
+               $this->insertRollback( $r, $rcObj );
+               # Tags
+               $this->insertTags( $r, $rcObj, $classes );
+               # Show how many people are watching this if enabled
+               $r .= $this->numberofWatchingusers($rcObj->numberofWatchingusers);
+
+               $r .= "</td></tr></table>\n";
+
+               wfProfileOut( __METHOD__ );
+
+               return $r;
+       }
+
+       /**
+        * If enhanced RC is in use, this function takes the previously cached
+        * RC lines, arranges them, and outputs the HTML
+        */
+       protected function recentChangesBlock() {
+               if( count ( $this->rc_cache ) == 0 ) {
+                       return '';
+               }
+
+               wfProfileIn( __METHOD__ );
+
+               $blockOut = '';
+               foreach( $this->rc_cache as $block ) {
+                       if( count( $block ) < 2 ) {
+                               $blockOut .= $this->recentChangesBlockLine( array_shift( $block ) );
+                       } else {
+                               $blockOut .= $this->recentChangesBlockGroup( $block );
+                       }
+               }
+
+               wfProfileOut( __METHOD__ );
+
+               return '<div>'.$blockOut.'</div>';
+       }
+
+       /**
+        * Returns text for the end of RC
+        * If enhanced RC is in use, returns pretty much all the text
+        */
+       public function endRecentChangesList() {
+               return $this->recentChangesBlock() . parent::endRecentChangesList();
+       }
+
 }
-?>