Merge "Rewrite logstash key conflict warning from I6677dbf6"

[lhc/web/wiklou.git] / includes / specials / SpecialLog.php

diff --git a/includes/specials/SpecialLog.php b/includes/specials/SpecialLog.php
index 95b7b7e..533a331 100644 (file)
--- a/includes/specials/SpecialLog.php
+++ b/includes/specials/SpecialLog.php
@@ -37,6 +37,7 @@ class SpecialLog extends SpecialPage {
                $this->setHeaders();
                $this->outputHeader();
                $this->getOutput()->addModules( 'mediawiki.userSuggest' );
+               $this->addHelpLink( 'Help:Log' );
 
                $opts = new FormOptions;
                $opts->add( 'type', '' );
@@ -147,7 +148,8 @@ class SpecialLog extends SpecialPage {
 
        private function parseParams( FormOptions $opts, $par ) {
                # Get parameters
-               $parms = explode( '/', ( $par = ( $par !== null ) ? $par : '' ) );
+               $par = $par !== null ? $par : '';
+               $parms = explode( '/', $par );
                $symsForAll = [ '*', 'all' ];
                if ( $parms[0] != '' &&
                        ( in_array( $par, $this->getConfig()->get( 'LogTypes' ) ) || in_array( $par, $symsForAll ) )
@@ -186,7 +188,8 @@ class SpecialLog extends SpecialPage {
 
                # Set relevant user
                if ( $pager->getPerformer() ) {
-                       $this->getSkin()->setRelevantUser( User::newFromName( $pager->getPerformer() ) );
+                       $performerUser = User::newFromName( $pager->getPerformer(), false );
+                       $this->getSkin()->setRelevantUser( $performerUser );
                }
 
                # Show form options