Merge "LogEventsList: Add backwards-compatibility for log-show-hide messages"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 18 Jul 2018 21:03:59 +0000 (21:03 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 18 Jul 2018 21:03:59 +0000 (21:03 +0000)
1  2 
includes/logging/LogEventsList.php

@@@ -173,7 -173,6 +173,7 @@@ class LogEventsList extends ContextSour
                $htmlForm = new HTMLForm( $formDescriptor, $this->getContext() );
                $htmlForm
                        ->setSubmitText( $this->msg( 'logeventslist-submit' )->text() )
 +                      ->setMethod( 'get' )
                        ->setWrapperLegendMsg( 'log' );
  
                // TODO This will should be removed at some point. See T199495.
                $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 ) {
                                $default[] = $type;