| Index: trunk/extensions/GlobalBlocking/SpecialGlobalBlock.php |
| — | — | @@ -165,9 +165,9 @@ |
| 166 | 166 | $fields = array (); |
| 167 | 167 | |
| 168 | 168 | // Who to block |
| 169 | | - $fields['ipaddress'] = wfInput( 'wpAddress', 45, $this->mAddress ); |
| | 169 | + $fields['ipaddress'] = Xml::input( 'wpAddress', 45, $this->mAddress ); |
| 170 | 170 | // Why to block them |
| 171 | | - $fields['globalblocking-block-reason'] = wfInput( 'wpReason', 45, $this->mReason ); |
| | 171 | + $fields['globalblocking-block-reason'] = Xml::input( 'wpReason', 45, $this->mReason ); |
| 172 | 172 | |
| 173 | 173 | // How long to block them for |
| 174 | 174 | if ( ( $dropdown = wfMsgNoTrans( 'globalblocking-expiry-options' ) ) != '-') { |
| — | — | @@ -179,17 +179,17 @@ |
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | if ($dropdown == false ) { |
| 183 | | - $fields['globalblocking-block-expiry'] = wfInput( 'wpExpiry', 45, $this->mExpiry ); |
| | 183 | + $fields['globalblocking-block-expiry'] = Xml::input( 'wpExpiry', 45, $this->mExpiry ); |
| 184 | 184 | } else { |
| 185 | 185 | $fields['globalblocking-block-expiry'] = $this->buildExpirySelector( 'wpExpiry', 'wpExpiry', $this->mExpirySelection, $dropdown ); |
| 186 | | - $fields['globalblocking-block-expiry-otherfield'] = wfInput( 'wpExpiryOther', 45, $this->mExpiry == $this->mExpirySelection ? '' : $this->mExpiry ); |
| | 186 | + $fields['globalblocking-block-expiry-otherfield'] = Xml::input( 'wpExpiryOther', 45, $this->mExpiry == $this->mExpirySelection ? '' : $this->mExpiry ); |
| 187 | 187 | } |
| 188 | 188 | |
| 189 | 189 | // Block all users, or just anonymous ones |
| 190 | | - $fields['globalblocking-block-options'] = wfCheckLabel( wfMsg( 'ipbanononly' ), 'wpAnonOnly', 'wpAnonOnly', $this->mAnonOnly ); |
| | 190 | + $fields['globalblocking-block-options'] = Xml::checkLabel( wfMsg( 'ipbanononly' ), 'wpAnonOnly', 'wpAnonOnly', $this->mAnonOnly ); |
| 191 | 191 | |
| 192 | 192 | // Build a form. |
| 193 | | - $form .= wfBuildForm( $fields, 'globalblocking-block-submit' ); |
| | 193 | + $form .= Xml::buildForm( $fields, 'globalblocking-block-submit' ); |
| 194 | 194 | |
| 195 | 195 | $form .= Xml::hidden( 'wpEditToken', $wgUser->editToken() ); |
| 196 | 196 | |
| Index: trunk/extensions/ProfileMonitor/ProfileMonitor.class.php |
| — | — | @@ -41,11 +41,11 @@ |
| 42 | 42 | |
| 43 | 43 | private function makeSearchForm( $process, $wild = false ) { |
| 44 | 44 | $self = Title::makeTitle( NS_SPECIAL, 'Profiling' ); |
| 45 | | - $html = wfOpenElement( 'form', array( 'method' => 'post', 'action' => $self->getLocalUrl() ) ); |
| | 45 | + $html = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $self->getLocalUrl() ) ); |
| 46 | 46 | $html .= '<table><tr><td>' . wfMsgHtml( 'profiling-process' ) . '</td><td>'; |
| 47 | | - $html .= wfInput( 'process', 50, $process ) . '</td></tr><td align="right">' . wfCheck( 'wildcard', $wild ) . '</td>'; |
| | 47 | + $html .= Xml::input( 'process', 50, $process ) . '</td></tr><td align="right">' . Xml::check( 'wildcard', $wild ) . '</td>'; |
| 48 | 48 | $html .= '<td>' . wfMsgHtml( 'profiling-wildcard' ) . '</td></tr>'; |
| 49 | | - $html .= '<tr><td> </td><td>' . wfSubmitButton( wfMsg( 'profiling-ok' ), array( 'name' => 'submit' ) ) . '</td></table></form>'; |
| | 49 | + $html .= '<tr><td> </td><td>' . Xml::submitButton( wfMsg( 'profiling-ok' ), array( 'name' => 'submit' ) ) . '</td></table></form>'; |
| 50 | 50 | return $html; |
| 51 | 51 | } |
| 52 | 52 | |