X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialLog.php;h=21c166c65df89cd25e5ad47eed0f0c07c7665d64;hb=466085b74b4071783a2a9663caac8744134de207;hp=54afde182de7107956f14db8376ab4781f1284c7;hpb=c5d44cc0cfcb8053479f617f4a5c2427178948dd;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/SpecialLog.php b/includes/specials/SpecialLog.php
index 54afde182d..21c166c65d 100644
--- a/includes/specials/SpecialLog.php
+++ b/includes/specials/SpecialLog.php
@@ -38,7 +38,9 @@ class SpecialLog extends SpecialPage {
 
 		$this->setHeaders();
 		$this->outputHeader();
-		$this->getOutput()->addModules( 'mediawiki.userSuggest' );
+		$out = $this->getOutput();
+		$out->addModules( 'mediawiki.userSuggest' );
+		$out->addModuleStyles( 'mediawiki.interface.helpers.styles' );
 		$this->addHelpLink( 'Help:Log' );
 
 		$opts = new FormOptions;
@@ -104,30 +106,12 @@ class SpecialLog extends SpecialPage {
 			$offenderName = $opts->getValue( 'offender' );
 			$offender = empty( $offenderName ) ? null : User::newFromName( $offenderName, false );
 			if ( $offender ) {
-				if ( $wgActorTableSchemaMigrationStage === MIGRATION_NEW ) {
+				if ( $wgActorTableSchemaMigrationStage & SCHEMA_COMPAT_READ_NEW ) {
 					$qc = [ 'ls_field' => 'target_author_actor', 'ls_value' => $offender->getActorId() ];
+				} elseif ( $offender->getId() > 0 ) {
+					$qc = [ 'ls_field' => 'target_author_id', 'ls_value' => $offender->getId() ];
 				} else {
-					if ( $offender->getId() > 0 ) {
-						$field = 'target_author_id';
-						$value = $offender->getId();
-					} else {
-						$field = 'target_author_ip';
-						$value = $offender->getName();
-					}
-					if ( !$offender->getActorId() ) {
-						$qc = [ 'ls_field' => $field, 'ls_value' => $value ];
-					} else {
-						$db = wfGetDB( DB_REPLICA );
-						$qc = [
-							'ls_field' => [ 'target_author_actor', $field ], // So LogPager::getQueryInfo() works right
-							$db->makeList( [
-								$db->makeList(
-									[ 'ls_field' => 'target_author_actor', 'ls_value' => $offender->getActorId() ], LIST_AND
-								),
-								$db->makeList( [ 'ls_field' => $field, 'ls_value' => $value ], LIST_AND ),
-							], LIST_OR ),
-						];
-					}
+					$qc = [ 'ls_field' => 'target_author_ip', 'ls_value' => $offender->getName() ];
 				}
 			}
 		} else {
@@ -197,8 +181,7 @@ class SpecialLog extends SpecialPage {
 	 * - Otherwise, assume the whole subpage is a username.
 	 *
 	 * @param FormOptions $opts
-	 * @param $par
-	 * @throws ConfigException
+	 * @param string $par
 	 */
 	private function parseParams( FormOptions $opts, $par ) {
 		# Get parameters