Merge "SpecialLog: Don't put assignment within another expression"

diff --combined includes/specials/SpecialLog.php
index 95b7b7e,85728ef..bbe0e0d
--- 1/includes/specials/SpecialLog.php
--- 2/includes/specials/SpecialLog.php
+++ b/includes/specials/SpecialLog.php
@@@ -147,7 -147,8 +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 ) )
@@@ -169,6 -170,25 +170,6 @@@
                        LogEventsList::USE_CHECKBOXES
                );
  
 -              $action = '';
 -              // Allow to filter the log by actions
 -              $type = $opts->getValue( 'type' );
 -              if ( $type !== '' ) {
 -                      $actions = $this->getConfig()->get( 'ActionFilteredLogs' );
 -                      if ( isset( $actions[$type] ) ) {
 -                              // log type can be filtered by actions
 -                              $loglist->setAllowedActions( array_keys( $actions[$type] ) );
 -                              $action = $opts->getValue( 'subtype' );
 -                              if ( $action !== '' && isset( $actions[$type][$action] ) ) {
 -                                      // add condition to query
 -                                      $extraConds['log_action'] = $actions[$type][$action];
 -                              } else {
 -                                      // no action or invalid action
 -                                      $action = '';
 -                              }
 -                      }
 -              }
 -
                $pager = new LogPager(
                        $loglist,
                        $opts->getValue( 'type' ),
@@@ -178,8 -198,7 +179,8 @@@
                        $extraConds,
                        $opts->getValue( 'year' ),
                        $opts->getValue( 'month' ),
 -                      $opts->getValue( 'tagfilter' )
 +                      $opts->getValue( 'tagfilter' ),
 +                      $opts->getValue( 'subtype' )
                );
  
                $this->addHeader( $opts->getValue( 'type' ) );
@@@ -192,14 -211,14 +193,14 @@@
                # 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' ),
 -                      $action
 +                      $pager->getTagFilter(),
 +                      $pager->getAction()
                );
  
                # Insert list