Merge "Add phpdoc for some ApiQueryInfo properties"

[lhc/web/wiklou.git] / includes / htmlform / HTMLFormField.php

diff --git a/includes/htmlform/HTMLFormField.php b/includes/htmlform/HTMLFormField.php
index d4a293e..3ba2156 100644 (file)
--- a/includes/htmlform/HTMLFormField.php
+++ b/includes/htmlform/HTMLFormField.php
@@ -587,7 +587,7 @@ abstract class HTMLFormField {
                        // It might look weird, but it'll work OK.
                        return $this->getFieldLayoutOOUI(
                                new OOUI\Widget( array( 'content' => new OOUI\HtmlSnippet( $this->getDiv( $value ) ) ) ),
-                               array( 'infusable' => false )
+                               array( 'infusable' => false, 'align' => 'top' )
                        );
                }
 
@@ -1054,8 +1054,8 @@ abstract class HTMLFormField {
 
                foreach ( $oldoptions as $text => $data ) {
                        $options[] = array(
-                               'data' => $data,
-                               'label' => $text,
+                               'data' => (string)$data,
+                               'label' => (string)$text,
                        );
                }