From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 23 Jul 2018 20:55:21 +0000 (+0000)
Subject: Merge "LogPager: Add backwards-compatibility for hide_[type]_log URL params"
X-Git-Tag: 1.34.0-rc.0~4677
X-Git-Url: http://git.cyclocoop.org/%22.%24info%5B?a=commitdiff_plain;h=8ef91357819c1d1f90d4e6054ace504f625b246e;p=lhc%2Fweb%2Fwiklou.git

Merge "LogPager: Add backwards-compatibility for hide_[type]_log URL params"
---

8ef91357819c1d1f90d4e6054ace504f625b246e
diff --cc includes/logging/LogEventsList.php
index c9a7299862,7462dbf01d..382e246590
--- a/includes/logging/LogEventsList.php
+++ b/includes/logging/LogEventsList.php
@@@ -198,14 -196,9 +198,14 @@@ class LogEventsList extends ContextSour
  		$options = [];
  		$default = [];
  		foreach ( $filter as $type => $val ) {
 -			$options[ $this->msg( "logeventslist-{$type}-log" )->text() ] = $type;
 +			$message = $this->msg( "logeventslist-{$type}-log" );
 +			// FIXME: Remove this check once T199657 is fully resolved.
 +			if ( !$message->exists() ) {
 +				$message = $this->msg( "log-show-hide-{$type}" )->params( $this->msg( 'show' )->text() );
 +			}
 +			$options[ $message->text() ] = $type;
  
- 			if ( $val === 0 ) {
+ 			if ( $val === false ) {
  				$default[] = $type;
  			}
  		}