Merge "Follow-up cdc93a62bf: add serialize/unserialize tests for RedisBagOStuff"

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

diff --git a/includes/specials/SpecialLog.php b/includes/specials/SpecialLog.php
index d4c7c6a..af087a6 100644 (file)
--- a/includes/specials/SpecialLog.php
+++ b/includes/specials/SpecialLog.php
@@ -49,6 +49,7 @@ class SpecialLog extends SpecialPage {
                $opts->add( 'offset', '' );
                $opts->add( 'dir', '' );
                $opts->add( 'offender', '' );
+               $opts->add( 'subtype', '' );
 
                // Set values
                $opts->fetchValuesFromRequest( $this->getRequest() );
@@ -146,7 +147,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 ) )
@@ -167,6 +169,7 @@ class SpecialLog extends SpecialPage {
                        null,
                        LogEventsList::USE_CHECKBOXES
                );
+
                $pager = new LogPager(
                        $loglist,
                        $opts->getValue( 'type' ),
@@ -176,26 +179,29 @@ class SpecialLog extends SpecialPage {
                        $extraConds,
                        $opts->getValue( 'year' ),
                        $opts->getValue( 'month' ),
-                       $opts->getValue( 'tagfilter' )
+                       $opts->getValue( 'tagfilter' ),
+                       $opts->getValue( 'subtype' )
                );
 
                $this->addHeader( $opts->getValue( 'type' ) );
 
                # 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
                $loglist->showOptions(
                        $pager->getType(),
-                       $opts->getValue( 'user' ),
+                       $pager->getPerformer(),
                        $pager->getPage(),
                        $pager->getPattern(),
                        $pager->getYear(),
                        $pager->getMonth(),
                        $pager->getFilterParams(),
-                       $opts->getValue( 'tagfilter' )
+                       $pager->getTagFilter(),
+                       $pager->getAction()
                );
 
                # Insert list