MediaWiki 1.16.0

[autoinstallsdev/mediawiki.git] / includes / specials / SpecialLog.php

diff --git a/includes/specials/SpecialLog.php b/includes/specials/SpecialLog.php
index 492c2608a7cc4f99223ce560e6ea430343861291..d1ccc8c4803661c79d9d290453d3c2aefe6bdec8 100644 (file)
--- a/includes/specials/SpecialLog.php
+++ b/includes/specials/SpecialLog.php
@@ -45,20 +45,31 @@ function wfSpecialLog( $par = '' ) {
        $pattern = $wgRequest->getBool( 'pattern' );
        $y = $wgRequest->getIntOrNull( 'year' );
        $m = $wgRequest->getIntOrNull( 'month' );
+       $tagFilter = $wgRequest->getVal( 'tagfilter' );
        # Don't let the user get stuck with a certain date
        $skip = $wgRequest->getText( 'offset' ) || $wgRequest->getText( 'dir' ) == 'prev';
        if( $skip ) {
                $y = '';
                $m = '';
        }
+       # Handle type-specific inputs
+       $qc = array();
+       if( $type == 'suppress' ) {
+               $offender = User::newFromName( $wgRequest->getVal('offender'), false );
+               if( $offender && $offender->getId() > 0 ) {
+                       $qc = array( 'ls_field' => 'target_author_id', 'ls_value' => $offender->getId() );
+               } else if( $offender && IP::isIPAddress( $offender->getName() ) ) {
+                       $qc = array( 'ls_field' => 'target_author_ip', 'ls_value' => $offender->getName() );
+               }
+       }
        # Create a LogPager item to get the results and a LogEventsList item to format them...
        $loglist = new LogEventsList( $wgUser->getSkin(), $wgOut, 0 );
-       $pager = new LogPager( $loglist, $type, $user, $title, $pattern, array(), $y, $m );
+       $pager = new LogPager( $loglist, $type, $user, $title, $pattern, $qc, $y, $m, $tagFilter );
        # Set title and add header
        $loglist->showHeader( $pager->getType() );
        # Show form options
        $loglist->showOptions( $pager->getType(), $pager->getUser(), $pager->getPage(), $pager->getPattern(),
-               $pager->getYear(), $pager->getMonth(), $pager->getFilterParams() );
+               $pager->getYear(), $pager->getMonth(), $pager->getFilterParams(), $tagFilter );
        # Insert list
        $logBody = $pager->getBody();
        if( $logBody ) {