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

Improve handling of the required argument in HTMLForm field definitions

Browse source 
array( 'required' => false ) will now result in the field not being required rather then the unexpected opossite.

And this is now possible (without doing some extra if)

array( 'required' => getSomeBoolean() )

Change-Id: I1fc22b16ab1fa17111c48aa664aaf47de5f7075a
This commit is contained in:
jeroendedauw 2012-08-12 00:23:46 +02:00
parent f734de5f7b
commit 06db921d75
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
includes/HTMLForm.php
View file

@ -1109,7 +1109,7 @@ abstract class HTMLFormField {
* @return Mixed Bool true on success, or String error to display.
*/
function validate( $value, $alldata ) {
if ( isset( $this->mParams['required'] ) && $value === '' ) {
if ( isset( $this->mParams['required'] ) && $this->mParams['required'] !== false && $value === '' ) {
return wfMsgExt( 'htmlform-required', 'parseinline' );
}
@ -2153,7 +2153,7 @@ class HTMLSelectAndOtherField extends HTMLSelectField {
return $p;
}
if ( isset( $this->mParams['required'] ) && $value[1] === '' ) {
if ( isset( $this->mParams['required'] ) && $this->mParams['required'] !== false && $value[1] === '' ) {
return wfMsgExt( 'htmlform-required', 'parseinline' );
}