Remove "Squiz.WhiteSpace.FunctionSpacing" from phpcs exclusions

[lhc/web/wiklou.git] / includes / actions / HistoryAction.php

diff --git a/includes/actions/HistoryAction.php b/includes/actions/HistoryAction.php
index 7ff6f7d..706241a 100644 (file)
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -139,6 +139,7 @@ class HistoryAction extends FormlessAction {
                }
                return $year && $month && $day ? $year . '-' . $month . '-' . $day : '';
        }
+
        /**
         * Print the history page for an article.
         */
@@ -181,10 +182,9 @@ class HistoryAction extends FormlessAction {
                }
 
                // Handle atom/RSS feeds.
-               $feedType = $request->getVal( 'feed' );
-               if ( $feedType ) {
+               $feedType = $request->getRawVal( 'feed' );
+               if ( $feedType !== null ) {
                        $this->feed( $feedType );
-
                        return;
                }
 
@@ -268,8 +268,10 @@ class HistoryAction extends FormlessAction {
                $htmlForm
                        ->setMethod( 'get' )
                        ->setAction( wfScript() )
+                       ->setCollapsibleOptions( true )
                        ->setId( 'mw-history-searchform' )
                        ->setSubmitText( $this->msg( 'historyaction-submit' )->text() )
+                       ->setWrapperAttributes( [ 'id' => 'mw-history-search' ] )
                        ->setWrapperLegend( $this->msg( 'history-fieldset-title' )->text() );
                $htmlForm->loadData();