FU r106752: use "media-" instead of "images-" in container names. Long live books...

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

diff --git a/includes/logging/LogFormatter.php b/includes/logging/LogFormatter.php
index 40cedbc..441c22b 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
@@ -274,7 +274,7 @@ class LogFormatter {
         */
        protected function msg( $key ) {
                return wfMessage( $key )
-                       ->inLanguage( $this->context->getLang() )
+                       ->inLanguage( $this->context->getLanguage() )
                        ->title( $this->context->getTitle() );
        }
 
@@ -378,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;
 
@@ -395,13 +395,13 @@ class DeleteLogFormatter extends LogFormatter {
                                foreach ( $extra as $v ) {
                                        $changes[] = $this->msg( $v )->plain();
                                }
-                               $changeText =  $this->context->getLang()->listToText( $changes );
+                               $changeText =  $this->context->getLanguage()->listToText( $changes );
 
 
                                $newParams = array_slice( $params, 0, 3 );
                                $newParams[3] = $changeText;
                                $count = count( explode( ',', $params[$paramStart] ) );
-                               $newParams[4] = $this->context->getLang()->formatNum( $count );
+                               $newParams[4] = $this->context->getLanguage()->formatNum( $count );
                                return $this->parsedParametersDeleteLog = $newParams;
                        } else {
                                return $this->parsedParametersDeleteLog = array_slice( $params, 0, 3 );
@@ -442,7 +442,7 @@ class PatrolLogFormatter extends LogFormatter {
 
                $target = $this->entry->getTarget();
                $oldid = $params[3];
-               $revision = $this->context->getLang()->formatNum( $oldid, true );
+               $revision = $this->context->getLanguage()->formatNum( $oldid, true );
 
                if ( $this->plaintext ) {
                        $revlink = $revision;
@@ -481,7 +481,6 @@ class NewUsersLogFormatter extends LogFormatter {
        }
 
        public function getComment() {
-               $subtype = $this->entry->getSubtype();
                $timestamp = wfTimestamp( TS_MW, $this->entry->getTimestamp() );
                if ( $timestamp < '20080129000000' ) {
                        # Suppress $comment from old entries (before 2008-01-29),
@@ -490,4 +489,4 @@ class NewUsersLogFormatter extends LogFormatter {
                }
                return parent::getComment();
        }
-}
\ No newline at end of file
+}