Localisation updates Cantonese, Chinese and Old/Late Time Chinese

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

diff --git a/includes/RecentChange.php b/includes/RecentChange.php
index b3fe325..f2e49d4 100644 (file)
--- a/includes/RecentChange.php
+++ b/includes/RecentChange.php
@@ -1,7 +1,4 @@
 <?php
-/**
- *
- */
 
 /**
  * Utility class for creating new RC entries
@@ -222,13 +219,21 @@ class RecentChange
                }
 
                # E-mail notifications
-               global $wgUseEnotif;
-               if( $wgUseEnotif ) {
-                       # this would be better as an extension hook
-                       global $wgUser;
-                       $enotif = new EmailNotification;
+               global $wgUseEnotif, $wgShowUpdatedMarker, $wgUser;
+               if( $wgUseEnotif || $wgShowUpdatedMarker ) {
+                       // Users
+                       if( $this->mAttribs['rc_user'] ) {
+                               $editor = ($wgUser->getId() == $this->mAttribs['rc_user']) ? 
+                                       $wgUser : User::newFromID( $this->mAttribs['rc_user'] );
+                       // Anons
+                       } else {
+                               $editor = ($wgUser->getName() == $this->mAttribs['rc_user_text']) ? 
+                                       $wgUser : User::newFromName( $this->mAttribs['rc_user_text'], false );
+                       }
+                       # FIXME: this would be better as an extension hook
+                       $enotif = new EmailNotification();
                        $title = Title::makeTitle( $this->mAttribs['rc_namespace'], $this->mAttribs['rc_title'] );
-                       $enotif->notifyOnPageChange( $wgUser, $title,
+                       $enotif->notifyOnPageChange( $editor, $title,
                                $this->mAttribs['rc_timestamp'],
                                $this->mAttribs['rc_comment'],
                                $this->mAttribs['rc_minor'],
@@ -284,7 +289,7 @@ class RecentChange
                        'rc_type'       => RC_EDIT,
                        'rc_minor'      => $minor ? 1 : 0,
                        'rc_cur_id'     => $title->getArticleID(),
-                       'rc_user'       => $user->getID(),
+                       'rc_user'       => $user->getId(),
                        'rc_user_text'  => $user->getName(),
                        'rc_comment'    => $comment,
                        'rc_this_oldid' => $newId,
@@ -338,7 +343,7 @@ class RecentChange
                        'rc_type'           => RC_NEW,
                        'rc_minor'          => $minor ? 1 : 0,
                        'rc_cur_id'         => $title->getArticleID(),
-                       'rc_user'           => $user->getID(),
+                       'rc_user'           => $user->getId(),
                        'rc_user_text'      => $user->getName(),
                        'rc_comment'        => $comment,
                        'rc_this_oldid'     => $newId,
@@ -389,7 +394,7 @@ class RecentChange
                        'rc_type'       => $overRedir ? RC_MOVE_OVER_REDIRECT : RC_MOVE,
                        'rc_minor'      => 0,
                        'rc_cur_id'     => $oldTitle->getArticleID(),
-                       'rc_user'       => $user->getID(),
+                       'rc_user'       => $user->getId(),
                        'rc_user_text'  => $user->getName(),
                        'rc_comment'    => $comment,
                        'rc_this_oldid' => 0,
@@ -447,7 +452,7 @@ class RecentChange
                        'rc_type'       => RC_LOG,
                        'rc_minor'      => 0,
                        'rc_cur_id'     => $target->getArticleID(),
-                       'rc_user'       => $user->getID(),
+                       'rc_user'       => $user->getId(),
                        'rc_user_text'  => $user->getName(),
                        'rc_comment'    => $logComment,
                        'rc_this_oldid' => 0,
@@ -596,12 +601,12 @@ class RecentChange
                $user = $this->cleanupForIRC( $rc_user_text );
 
                if ( $rc_type == RC_LOG ) {
-                       $logTargetText = $titleObj->getPrefixedText();
+                       $logTargetText = $this->getTitle()->getPrefixedText();
                        $comment = $this->cleanupForIRC( str_replace($logTargetText,"\00302$logTargetText\00310",$actionComment) );
                        $flag = $rc_log_action;
                } else {
                        $comment = $this->cleanupForIRC( $rc_comment );
-                       $flag = ($rc_minor ? "M" : "") . ($rc_new ? "N" : "");
+                       $flag = ($rc_new ? "N" : "") . ($rc_minor ? "M" : "") . ($rc_bot ? "B" : "");
                }
                # see http://www.irssi.org/documentation/formats for some colour codes. prefix is \003,
                # no colour (\003) switches back to the term default