Merge "Treat phpdbg as run from the command line when checking PHP_SAPI"

[lhc/web/wiklou.git] / includes / Xml.php

diff --git a/includes/Xml.php b/includes/Xml.php
index eadc7d1..b20f66e 100644 (file)
--- a/includes/Xml.php
+++ b/includes/Xml.php
@@ -532,8 +532,8 @@ class Xml {
         *
         * @param string $list Correctly formatted text (newline delimited) to be
         *   used to generate the options.
-        * @param array $params Extra parameters
-        * @param string $params['other'] If set, add an option with this as text and a value of 'other'
+        * @param array $params Extra parameters:
+        *   - string $params['other'] If set, add an option with this as text and a value of 'other'
         * @return array Array keys are textual labels, values are internal values
         */
        public static function listDropDownOptions( $list, $params = [] ) {
@@ -615,9 +615,9 @@ class Xml {
 
                if ( $content !== false ) {
                        $s .= $content . "\n";
+                       $s .= self::closeElement( 'fieldset' ) . "\n";
                }
 
-               $s .= self::closeElement( 'fieldset' ) . "\n";
                return $s;
        }