Removed false comment introduced in r86633

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

diff --git a/includes/ChangesList.php b/includes/ChangesList.php
index 745fadf..59bb7b2 100644 (file)
--- a/includes/ChangesList.php
+++ b/includes/ChangesList.php
@@ -16,6 +16,10 @@ class RCCacheEntry extends RecentChange {
        var $curlink , $difflink, $lastlink, $usertalklink, $versionlink;
        var $userlink, $timestamp, $watched;
 
+       /**
+        * @param $rc RecentChange
+        * @return RCCacheEntry
+        */
        static function newFromParent( $rc ) {
                $rc2 = new RCCacheEntry;
                $rc2->mAttribs = $rc->mAttribs;
@@ -28,6 +32,10 @@ class RCCacheEntry extends RecentChange {
  * Base class for all changes lists
  */
 class ChangesList {
+
+       /**
+        * @var Skin
+        */
        public $skin;
        protected $watchlist = false;
        
@@ -47,12 +55,12 @@ class ChangesList {
         * @param $user User to fetch the list class for
         * @return ChangesList derivative
         */
-       public static function newFromUser( &$user ) {
+       public static function newFromUser( $user ) {
                global $wgRequest;
 
                $sk = $user->getSkin();
                $list = null;
-               if( wfRunHooks( 'FetchChangesList', array( &$user, &$sk, &$list ) ) ) {
+               if( wfRunHooks( 'FetchChangesList', array( $user, &$sk, &$list ) ) ) {
                        $new = $wgRequest->getBool( 'enhanced', $user->getOption( 'usenewrc' ) );
                        return $new ? new EnhancedChangesList( $sk ) : new OldChangesList( $sk );
                } else {
@@ -83,7 +91,7 @@ class ChangesList {
 
        /**
         * Returns the appropriate flags for new page, minor change and patrolling
-        * @param $flags Associative array of 'flag' => Bool
+        * @param $flags Array Associative array of 'flag' => Bool
         * @param $nothing String to use for empty space
         * @return String
         */
@@ -115,7 +123,7 @@ class ChangesList {
                                'botedit' => array( 'boteditletter', 'recentchanges-label-bot' ),
                                'unpatrolled' => array( 'unpatrolledletter', 'recentchanges-label-unpatrolled' ), 
                        );
-                       foreach( $messages as $key => &$value ) {
+                       foreach( $messages as &$value ) {
                                $value[0] = wfMsgExt( $value[0], 'escapenoentities' );
                                $value[1] = wfMsgExt( $value[1], 'escapenoentities' );
                        }
@@ -127,6 +135,8 @@ class ChangesList {
                        'minor' => 'minoredit',
                        'bot' => 'botedit',
                        'unpatrolled' => 'unpatrolled',
+                       'minoredit' => 'minoredit',
+                       'botedit' => 'botedit',
                );
                $flag = $map[$flag];
 
@@ -194,6 +204,11 @@ class ChangesList {
                }
        }
 
+       /**
+        * @param $s
+        * @param $rc RecentChange
+        * @return void
+        */
        public function insertMove( &$s, $rc ) {
                # Diff
                $s .= '(' . $this->message['diff'] . ') (';
@@ -251,6 +266,12 @@ class ChangesList {
                ) . ')';
        }
 
+       /**
+        * @param $s
+        * @param $rc RecentChange
+        * @param $unpatrolled
+        * @return void
+        */
        public function insertDiffHist( &$s, &$rc, $unpatrolled ) {
                # Diff link
                if( $rc->mAttribs['rc_type'] == RC_NEW || $rc->mAttribs['rc_type'] == RC_LOG ) {
@@ -291,6 +312,13 @@ class ChangesList {
                $s .= ') . . ';
        }
 
+       /**
+        * @param $s
+        * @param $rc RecentChange
+        * @param $unpatrolled
+        * @param $watched
+        * @return void
+        */
        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
@@ -332,23 +360,34 @@ class ChangesList {
                $s .= " $articlelink";
        }
 
+       /**
+        * @param $s
+        * @param $rc RecentChange
+        * @return void
+        */
        public function insertTimestamp( &$s, $rc ) {
                global $wgLang;
                $s .= $this->message['semicolon-separator'] . 
                        $wgLang->time( $rc->mAttribs['rc_timestamp'], true, true ) . ' . . ';
        }
 
-       /** Insert links to user page, user talk page and eventually a blocking link */
+       /** Insert links to user page, user talk page and eventually a blocking link
+        *
+        * @param $rc RecentChange
+        */
        public function insertUserRelatedLinks( &$s, &$rc ) {
                if( $this->isDeleted( $rc, Revision::DELETED_USER ) ) {
-                  $s .= ' <span class="history-deleted">' . wfMsgHtml( 'rev-deleted-user' ) . '</span>';
+                       $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'] );
+                       $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'] );
                }
        }
 
-       /** insert a formatted action */
+       /** insert a formatted action
+        *
+        * @param $rc RecentChange
+        */
        public function insertAction( &$s, &$rc ) {
                if( $rc->mAttribs['rc_type'] == RC_LOG ) {
                        if( $this->isDeleted( $rc, LogPage::DELETED_ACTION ) ) {
@@ -360,7 +399,10 @@ class ChangesList {
                }
        }
 
-       /** insert a formatted comment */
+       /** insert a formatted comment
+        *
+        * @param $rc RecentChange
+        */
        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 ) ) {
@@ -430,7 +472,11 @@ class ChangesList {
                }
        }
        
-       /** Inserts a rollback link */
+       /** Inserts a rollback link
+        *
+        * @param $s
+        * @param $rc RecentChange
+        */
        public function insertRollback( &$s, &$rc ) {
                global $wgUser;
                if( !$rc->mAttribs['rc_new'] && $rc->mAttribs['rc_this_oldid'] && $rc->mAttribs['rc_cur_id'] ) {
@@ -451,6 +497,12 @@ class ChangesList {
                }
        }
 
+       /**
+        * @param $s
+        * @param $rc RecentChange
+        * @param $classes
+        * @return
+        */
        public function insertTags( &$s, &$rc, &$classes ) {
                if ( empty($rc->mAttribs['ts_tags']) )
                        return;
@@ -472,6 +524,8 @@ class ChangesList {
 class OldChangesList extends ChangesList {
        /**
         * Format a line using the old system (aka without any javascript).
+        *
+        * @param $rc RecentChange
         */
        public function recentChangesLine( &$rc, $watched = false, $linenumber = null ) {
                global $wgLang, $wgRCShowChangedSize, $wgUser;
@@ -503,7 +557,7 @@ class OldChangesList extends ChangesList {
                        $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'] );
+                       list( $name, $subpage ) = SpecialPageFactory::resolveAlias( $rc->mAttribs['rc_title'] );
                        if( $name == 'Log' ) {
                                $this->insertLog( $s, $rc->getTitle(), $subpage );
                        }
@@ -514,9 +568,9 @@ class OldChangesList extends ChangesList {
                        $s .= $this->recentChangesFlags( 
                                array(
                                        'newpage' => $rc->mAttribs['rc_new'],
-                                       'minoredit' => $rc->mAttribs['rc_minor'],
+                                       'minor' => $rc->mAttribs['rc_minor'],
                                        'unpatrolled' => $unpatrolled, 
-                                       'botedit' => $rc->mAttribs['rc_bot']
+                                       'bot' => $rc->mAttribs['rc_bot']
                                ),
                                ''
                        );
@@ -582,6 +636,8 @@ class EnhancedChangesList extends ChangesList {
        }
        /**
         * Format a line for enhanced recentchange (aka with javascript and block of lines).
+        *
+        * @param $baseRC RecentChange
         */
        public function recentChangesLine( &$baseRC, $watched = false ) {
                global $wgLang, $wgUser;
@@ -637,7 +693,7 @@ class EnhancedChangesList extends ChangesList {
                        $watched = false;
                // Log entries (old format) and special pages
                } elseif( $rc->mAttribs['rc_namespace'] == NS_SPECIAL ) {
-                       list( $specialName, $logtype ) = SpecialPage::resolveAliasWithSubpage( $rc->mAttribs['rc_title'] );
+                       list( $specialName, $logtype ) = SpecialPageFactory::resolveAlias( $rc->mAttribs['rc_title'] );
                        if ( $specialName == 'Log' ) {
                                # Log updates, etc
                                $logname = LogPage::logName( $logtype );
@@ -830,9 +886,9 @@ class EnhancedChangesList extends ChangesList {
                # Main line
                $r .= '<td class="mw-enhanced-rc">' . $this->recentChangesFlags( array(
                        'newpage' => $isnew,
-                       'minoredit' => false,
+                       'minor' => false,
                        'unpatrolled' => $unpatrolled, 
-                       'botedit' => $bot ,
+                       'bot' => $bot ,
                ) );
 
                # Timestamp
@@ -934,9 +990,9 @@ class EnhancedChangesList extends ChangesList {
                        $r .= '<tr><td></td><td class="mw-enhanced-rc">';
                        $r .= $this->recentChangesFlags( array(
                                'newpage' => $rcObj->mAttribs['rc_new'],
-                               'minoredit' => $rcObj->mAttribs['rc_minor'],
+                               'minor' => $rcObj->mAttribs['rc_minor'],
                                'unpatrolled' => $rcObj->unpatrolled, 
-                               'botedit' => $rcObj->mAttribs['rc_bot'],
+                               'bot' => $rcObj->mAttribs['rc_bot'],
                        ) );
                        $r .= '&#160;</td><td class="mw-enhanced-rc-nested"><span class="mw-enhanced-rc-time">';
 
@@ -1051,6 +1107,8 @@ class EnhancedChangesList extends ChangesList {
 
        /**
         * Enhanced RC ungrouped line.
+        *
+        * @param $rcObj RecentChange
         * @return String: a HTML formated line (generated using $r)
         */
        protected function recentChangesBlockLine( $rcObj ) {
@@ -1077,9 +1135,9 @@ class EnhancedChangesList extends ChangesList {
                } else {
                        $r .= $this->recentChangesFlags( array(
                                'newpage' => $type == RC_NEW,
-                               'minoredit' => $rcObj->mAttribs['rc_minor'],
+                               'mino' => $rcObj->mAttribs['rc_minor'],
                                'unpatrolled' => $rcObj->unpatrolled, 
-                               'botedit' => $rcObj->mAttribs['rc_bot'],
+                               'bot' => $rcObj->mAttribs['rc_bot'],
                        ) );
                }
                $r .= '&#160;'.$rcObj->timestamp.'&#160;</td><td>';
@@ -1128,6 +1186,7 @@ class EnhancedChangesList extends ChangesList {
                $this->insertComment( $r, $rcObj );
                $this->insertRollback( $r, $rcObj );
                # Tags
+               $classes = explode( ' ', $classes );
                $this->insertTags( $r, $rcObj, $classes );
                # Show how many people are watching this if enabled
                $r .= $this->numberofWatchingusers($rcObj->numberofWatchingusers);