Use local context to get messages

[lhc/web/wiklou.git] / includes / logging / LogFormatter.php

diff --git a/includes/logging/LogFormatter.php b/includes/logging/LogFormatter.php
index 41ebefc..73a39a7 100644 (file)
--- a/includes/logging/LogFormatter.php
+++ b/includes/logging/LogFormatter.php
@@ -36,7 +36,7 @@ class LogFormatter {
                        $handler = $wgLogActionsHandlers[$wildcard];
                }
 
-               if ( $handler !== '' && class_exists( $handler ) ) {
+               if ( $handler !== '' && is_string( $handler ) && class_exists( $handler ) ) {
                        return new $handler( $entry );
                }
 
@@ -154,7 +154,7 @@ class LogFormatter {
 
        /**
         * Extract parameters intented for action message from
-        * array of all parameters. The are three hardcoded
+        * array of all parameters. There are three hardcoded
         * parameters (array zero-indexed, this list not):
         *  - 1: user name with premade link
         *  - 2: usable for gender magic function
@@ -226,25 +226,7 @@ class LogFormatter {
         */
        public function getPerformerElement() {
                $performer = $this->entry->getPerformer();
-
-               if ( $this->plaintext ) {
-                       $element = $performer->getName();
-               } else {
-                       $element = Linker::userLink(
-                               $performer->getId(),
-                               $performer->getName()
-                       );
-
-                       if ( $this->linkFlood ) {
-                               $element .= Linker::userToolLinks(
-                                       $performer->getId(),
-                                       $performer->getName(),
-                                       true, // Red if no edits
-                                       0, // Flags
-                                       $performer->getEditCount()
-                               );
-                       }
-               }
+               $element = $this->makeUserLink( $performer );
 
                if ( $this->entry->isDeleted( LogPage::DELETED_USER ) ) {
                        $element = self::getRestrictedElement( 'rev-deleted-user' );
@@ -296,6 +278,28 @@ class LogFormatter {
                        ->title( $this->context->getTitle() );
        }
 
+       protected function makeUserLink( User $user ) {
+               if ( $this->plaintext ) {
+                       $element = $user->getName();
+               } else {
+                       $element = Linker::userLink(
+                               $user->getId(),
+                               $user->getName()
+                       );
+
+                       if ( $this->linkFlood ) {
+                               $element .= Linker::userToolLinks(
+                                       $user->getId(),
+                                       $user->getName(),
+                                       true, // Red if no edits
+                                       0, // Flags
+                                       $user->getEditCount()
+                               );
+                       }
+               }
+               return $element;
+       }
+
 }
 
 /**
@@ -374,7 +378,7 @@ class DeleteLogFormatter extends LogFormatter {
                if ( in_array( $subtype, array( 'event', 'revision' ) ) ) {
                        if (
                                ($subtype === 'event' && count( $params ) === 6 ) ||
-                               ($subtype === 'revision' && $params[3] === 'revision' )
+                               ($subtype === 'revision' && isset( $params[3] ) && $params[3] === 'revision' )
                        ) {
                                $paramStart = $subtype === 'revision' ? 4 : 3;
 
@@ -455,4 +459,34 @@ class PatrolLogFormatter extends LogFormatter {
                $newParams[3] = Message::rawParam( $revlink );
                return $newParams;
        }
-}
\ No newline at end of file
+}
+
+/**
+ * This class formats new user log entries.
+ * @since 1.19
+ */
+class NewUsersLogFormatter extends LogFormatter {
+       protected function getMessageParameters() {
+               $params = parent::getMessageParameters();
+               if ( $this->entry->getSubtype() === 'create2' ) {
+                       if ( isset( $params[3] ) ) {
+                               $target = User::newFromId( $params[3] );
+                       } else {
+                               $target = User::newFromName( $this->entry->getTarget()->getText(), false );
+                       }
+                       $params[2] = Message::rawParam( $this->makeUserLink( $target ) );
+                       $params[3] = $target->getName();
+               }
+               return $params;
+       }
+
+       public function getComment() {
+               $timestamp = wfTimestamp( TS_MW, $this->entry->getTimestamp() );
+               if ( $timestamp < '20080129000000' ) {
+                       # Suppress $comment from old entries (before 2008-01-29),
+                       # not needed and can contain incorrect links
+                       return '';
+               }
+               return parent::getComment();
+       }
+}