Index: trunk/phase3/includes/Xml.php |
— | — | @@ -466,7 +466,7 @@ |
467 | 467 | if( $selected ) { |
468 | 468 | $attribs['selected'] = 'selected'; |
469 | 469 | } |
470 | | - return self::element( 'option', $attribs, $text ); |
| 470 | + return Html::element( 'option', $attribs, $text ); |
471 | 471 | } |
472 | 472 | |
473 | 473 | /** |
— | — | @@ -888,7 +888,7 @@ |
889 | 889 | * @return array|null |
890 | 890 | */ |
891 | 891 | public function getAttribute( $name ) { |
892 | | - if ( isset($this->attributes[$name]) ) { |
| 892 | + if ( isset( $this->attributes[$name] ) ) { |
893 | 893 | return $this->attributes[$name]; |
894 | 894 | } else { |
895 | 895 | return null; |
— | — | @@ -932,7 +932,7 @@ |
933 | 933 | foreach( $options as $label => $value ) { |
934 | 934 | if ( is_array( $value ) ) { |
935 | 935 | $contents = self::formatOptions( $value, $default ); |
936 | | - $data .= Xml::tags( 'optgroup', array( 'label' => $label ), $contents ) . "\n"; |
| 936 | + $data .= Html::rawElement( 'optgroup', array( 'label' => $label ), $contents ) . "\n"; |
937 | 937 | } else { |
938 | 938 | $data .= Xml::option( $label, $value, $value === $default ) . "\n"; |
939 | 939 | } |
— | — | @@ -951,7 +951,7 @@ |
952 | 952 | $contents .= self::formatOptions( $options, $this->default ); |
953 | 953 | } |
954 | 954 | |
955 | | - return Xml::tags( 'select', $this->attributes, rtrim( $contents ) ); |
| 955 | + return Html::rawElement( 'select', $this->attributes, rtrim( $contents ) ); |
956 | 956 | } |
957 | 957 | } |
958 | 958 | |