Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "xml: Move condition check of var before creating XmlSelect object"

Browse source
This commit is contained in:
jenkins-bot 2020-04-30 00:11:30 +00:00 committed by Gerrit Code Review
commit d506492d26
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
includes/xml/Xml.php
View file

@ -134,7 +134,7 @@ class Xml {
/**
* Create a date selector
*
* @param string $selected The month which should be selected, default ''.
* @param string|null $selected The month which should be selected, default ''.
* @param string|null $allmonths Value of a special item denoting all month.
* Null to not include (default).
* @param string $id Element identifier
@ -143,10 +143,12 @@ class Xml {
public static function monthSelector( $selected = '', $allmonths = null, $id = 'month' ) {
global $wgLang;
$options = [];
$data = new XmlSelect( 'month', $id, $selected );
if ( $selected === null ) {
$selected = '';
}
$data = new XmlSelect( 'month', $id, $selected );
if ( $allmonths !== null ) {
$options[wfMessage( 'monthsall' )->text()] = $allmonths;
}