http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100513
Revision: 100513
Author: johnduhart
Date: 2011-10-22 20:10:41 +0000 (Sat, 22 Oct 2011)
Log Message:
-----------
Removing extra stuff that was committed in r100512
Modified Paths:
--------------
trunk/phase3/includes/HTMLForm.php
Modified: trunk/phase3/includes/HTMLForm.php
===================================================================
--- trunk/phase3/includes/HTMLForm.php 2011-10-22 20:03:40 UTC (rev 100512)
+++ trunk/phase3/includes/HTMLForm.php 2011-10-22 20:10:41 UTC (rev 100513)
@@ -1374,8 +1374,6 @@
return $p;
}
- print_r( $value );
-
$validOptions = HTMLFormField::flattenOptions(
$this->mParams['options'] );
if ( in_array( $value, $validOptions ) )
@@ -1401,54 +1399,10 @@
$select->setAttribute( 'disabled', 'disabled' );
}
- if ( !empty( $this->mParams['multiple'] ) ) {
- $select->setAttribute( 'name', $this->mName . '[]' );
- $select->setAttribute( 'multiple', 'multiple' );
-
- if ( !empty( $this->mParams['size'] ) ) {
- $select->setAttribute( 'size',
$this->mParams['size'] );
- }
- }
-
$select->addOptions( $this->mParams['options'] );
return $select->getHTML();
}
-
- /**
- * @param $request WebRequest
- * @return String
- */
- function loadDataFromRequest( $request ) {
- if ( $this->mParent->getMethod() == 'post' ) {
- if( $request->wasPosted() ){
- # Checkboxes are just not added to the request
arrays if they're not checked,
- # so it's perfectly possible for there not to
be an entry at all
- return $request->getArray( $this->mName,
array() );
- } else {
- # That's ok, the user has not yet submitted the
form, so show the defaults
- return $this->getDefault();
- }
- } else {
- # This is the impossible case: if we look at $_GET and
see no data for our
- # field, is it because the user has not yet submitted
the form, or that they
- # have submitted it with all the options unchecked? We
will have to assume the
- # latter, which basically means that you can't specify
'positive' defaults
- # for GET forms.
- # @todo FIXME...
- return $request->getArray( $this->mName, array() );
- }
- }
-
- public static function keysAreValues( $array ) {
- $resultArray = array();
-
- foreach ( $array as $name => $value ) {
- $resultArray[$value] = $value;
- }
-
- return $resultArray;
- }
}
/**
@@ -1924,7 +1878,7 @@
$this->mParent->addHiddenField(
$this->mName,
- $value,
+ $this->mDefault,
$params
);
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
