* (bug 10117) Special:Wantedpages doesn't handle invalid titles in result - now print...

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

diff --git a/includes/RecentChange.php b/includes/RecentChange.php
index 081c71a..88a4598 100644 (file)
--- a/includes/RecentChange.php
+++ b/includes/RecentChange.php
@@ -1,7 +1,6 @@
 <?php
 /**
  *
- * @package MediaWiki
  */
 
 /**
@@ -39,7 +38,6 @@
  *      numberofWatchingusers
  *
  * @todo document functions and variables
- * @package MediaWiki
  */
 class RecentChange
 {
@@ -49,7 +47,7 @@ class RecentChange
 
        # Factory methods
 
-       /* static */ function newFromRow( $row )
+       public static function newFromRow( $row )
        {
                $rc = new RecentChange;
                $rc->loadFromRow( $row );
@@ -72,7 +70,7 @@ class RecentChange
         * @return RecentChange
         */
        public static function newFromId( $rcid ) {
-               $dbr =& wfGetDB( DB_SLAVE );
+               $dbr = wfGetDB( DB_SLAVE );
                $res = $dbr->select( 'recentchanges', '*', array( 'rc_id' => $rcid ), __METHOD__ );
                if( $res && $dbr->numRows( $res ) > 0 ) {
                        $row = $dbr->fetchObject( $res );
@@ -118,7 +116,7 @@ class RecentChange
                global $wgLocalInterwiki, $wgPutIPinRC, $wgRC2UDPAddress, $wgRC2UDPPort, $wgRC2UDPPrefix;
                $fname = 'RecentChange::save';
 
-               $dbw =& wfGetDB( DB_MASTER );
+               $dbw = wfGetDB( DB_MASTER );
                if ( !is_array($this->mExtra) ) {
                        $this->mExtra = array();
                }
@@ -197,10 +195,11 @@ class RecentChange
                global $wgUseEnotif;
                if( $wgUseEnotif ) {
                        # this would be better as an extension hook
+                       global $wgUser;
                        include_once( "UserMailer.php" );
                        $enotif = new EmailNotification();
                        $title = Title::makeTitle( $this->mAttribs['rc_namespace'], $this->mAttribs['rc_title'] );
-                       $enotif->notifyOnPageChange( $title,
+                       $enotif->notifyOnPageChange( $wgUser, $title,
                                $this->mAttribs['rc_timestamp'],
                                $this->mAttribs['rc_comment'],
                                $this->mAttribs['rc_minor'],
@@ -216,7 +215,7 @@ class RecentChange
        {
                $fname = 'RecentChange::markPatrolled';
 
-               $dbw =& wfGetDB( DB_MASTER );
+               $dbw = wfGetDB( DB_MASTER );
 
                $dbw->update( 'recentchanges',
                        array( /* SET */
@@ -282,10 +281,8 @@ class RecentChange
         * Makes an entry in the database corresponding to page creation
         * Note: the title object must be loaded with the new id using resetArticleID()
         * @todo Document parameters and return
-        * @public
-        * @static
         */
-       public static function notifyNew( $timestamp, &$title, $minor, &$user, $comment, $bot = "default",
+       public static function notifyNew( $timestamp, &$title, $minor, &$user, $comment, $bot = 'default',
          $ip='', $size = 0, $newId = 0 )
        {
                if ( !$ip ) {
@@ -294,7 +291,7 @@ class RecentChange
                                $ip = '';
                        }
                }
-               if ( $bot == 'default' ) {
+               if ( $bot === 'default' ) {
                        $bot = $user->isAllowed( 'bot' );
                }
 
@@ -504,6 +501,8 @@ class RecentChange
        function getIRCLine() {
                global $wgUseRCPatrol;
 
+               // FIXME: Would be good to replace these 2 extract() calls with something more explicit
+               // e.g. list ($rc_type, $rc_id) = array_values ($this->mAttribs); [or something like that]
                extract($this->mAttribs);
                extract($this->mExtra);
 
@@ -581,15 +580,17 @@ class RecentChange
                }
 
                $szdiff = $new - $old;
+               $formatedSize = wfMsgExt( 'rc-change-size', array( 'parsemag', 'escape'),
+                       $wgLang->formatNum($szdiff) );
 
                if( $szdiff < $wgRCChangedSizeThreshold ) {
-                       return '<strong class=\'mw-plusminus-neg\'>(' . $wgLang->formatNum( $szdiff ) . ')</strong>';
+                       return '<strong class=\'mw-plusminus-neg\'>(' . $formatedSize . ')</strong>';
                } elseif( $szdiff === 0 ) {
-                       return '<span class=\'mw-plusminus-null\'>(' . $wgLang->formatNum( $szdiff ) . ')</span>';
+                       return '<span class=\'mw-plusminus-null\'>(' . $formatedSize . ')</span>';
                } elseif( $szdiff > 0 ) {
-                       return '<span class=\'mw-plusminus-pos\'>(+' . $wgLang->formatNum( $szdiff ) . ')</span>';
+                       return '<span class=\'mw-plusminus-pos\'>(+' . $formatedSize . ')</span>';
                } else {
-                       return '<span class=\'mw-plusminus-neg\'>(' . $wgLang->formatNum( $szdiff ) . ')</span>';
+                       return '<span class=\'mw-plusminus-neg\'>(' . $formatedSize . ')</span>';
                }
        }
 }