Merge "Pass __METHOD__ to ping query in JobRunner::commitMasterChanges()"

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

diff --git a/includes/htmlform/HTMLForm.php b/includes/htmlform/HTMLForm.php
index 908fdf2..ce14003 100644 (file)
--- a/includes/htmlform/HTMLForm.php
+++ b/includes/htmlform/HTMLForm.php
@@ -207,6 +207,7 @@ class HTMLForm extends ContextSource {
                'table',
                'div',
                'raw',
+               'inline',
        );
 
        /**
@@ -356,6 +357,7 @@ class HTMLForm extends ContextSource {
         * @return bool
         */
        public function isVForm() {
+               wfDeprecated( __METHOD__, '1.25' );
                return false;
        }
 
@@ -1366,6 +1368,8 @@ class HTMLForm extends ContextSource {
                                $html = Html::rawElement( 'table',
                                                $attribs,
                                                Html::rawElement( 'tbody', array(), "\n$html\n" ) ) . "\n";
+                       } elseif ( $displayFormat === 'inline' ) {
+                               $html = Html::rawElement( 'span', $attribs, "\n$html\n" );
                        } else {
                                $html = Html::rawElement( 'div', $attribs, "\n$html\n" );
                        }