Merge "lockmanager: disable internal QuorumLockManager methods that should never...

[lhc/web/wiklou.git] / includes / htmlform / fields / HTMLInfoField.php

diff --git a/includes/htmlform/fields/HTMLInfoField.php b/includes/htmlform/fields/HTMLInfoField.php
index c0dbf50..ab59ff0 100644 (file)
--- a/includes/htmlform/fields/HTMLInfoField.php
+++ b/includes/htmlform/fields/HTMLInfoField.php
@@ -22,7 +22,7 @@ class HTMLInfoField extends HTMLFormField {
        public function getDefault() {
                $default = parent::getDefault();
                if ( $default instanceof Closure ) {
-                       $default = call_user_func( $default, $this->mParams );
+                       $default = $default( $this->mParams );
                }
                return $default;
        }
@@ -76,15 +76,15 @@ class HTMLInfoField extends HTMLFormField {
        }
 
        /**
-        * @param mixed $value
+        * @param mixed $value If not FieldLayout or subclass has been deprecated.
         * @return OOUI\FieldLayout
         * @since 1.32
         */
        public function getOOUI( $value ) {
                if ( !empty( $this->mParams['rawrow'] ) ) {
                        if ( !( $value instanceof OOUI\FieldLayout ) ) {
-                               wfDeprecated( "'default' parameter as a string when using 'rawrow' " .
-                                       "(must be a FieldLayout or subclass)", '1.32' );
+                               wfDeprecated( __METHOD__ . ": 'default' parameter as a string when using" .
+                                       "'rawrow' (must be a FieldLayout or subclass)", '1.32' );
                        }
                        return $value;
                }