| Index: trunk/phase3/includes/specials/SpecialRestrictUser.php |
| — | — | @@ -40,7 +40,7 @@ |
| 41 | 41 | public static function selectUserForm( $val = null, $error = null ) { |
| 42 | 42 | global $wgScript, $wgTitle; |
| 43 | 43 | $legend = wfMsgHtml( 'restrictuser-userselect' ); |
| 44 | | - $s = "<fieldset><legend>{$legend}</legend><form action=\"{$wgScript}\">"; |
| | 44 | + $s = Xml::fieldset( $legend ) . "<form action=\"{$wgScript}\">"; |
| 45 | 45 | if( $error ) |
| 46 | 46 | $s .= '<p>' . $error . '</p>'; |
| 47 | 47 | $s .= Xml::hidden( 'title', $wgTitle->getPrefixedDbKey() ); |
| — | — | @@ -53,7 +53,7 @@ |
| 54 | 54 | public static function existingRestrictions( $restrictions ) { |
| 55 | 55 | require_once( dirname( __FILE__ ) . '/SpecialListUserRestrictions.php' ); |
| 56 | 56 | $legend = wfMsgHtml( 'restrictuser-existing' ); |
| 57 | | - $s = "<fieldset><legend>{$legend}</legend><ul>"; |
| | 57 | + $s = Xml::fieldset( $legend ) . '<ul>'; |
| 58 | 58 | foreach( $restrictions as $r ) |
| 59 | 59 | $s .= UserRestrictionsPager::formatRestriction( $r ); |
| 60 | 60 | $s .= "</ul></fieldset>"; |
| — | — | @@ -82,7 +82,7 @@ |
| 83 | 83 | } |
| 84 | 84 | $useRequestValues = $wgRequest->getVal( 'type' ) == UserRestriction::PAGE; |
| 85 | 85 | $legend = wfMsgHtml( 'restrictuser-legend-page' ); |
| 86 | | - $wgOut->addHTML( "<fieldset><legend>{$legend}</legend>" ); |
| | 86 | + $wgOut->addHTML( Xml::fieldset( $legend ) ); |
| 87 | 87 | if( $error ) |
| 88 | 88 | $wgOut->addHTML( '<strong class="error">' . $error . '</strong>' ); |
| 89 | 89 | if( $success ) |
| — | — | @@ -145,7 +145,7 @@ |
| 146 | 146 | } |
| 147 | 147 | $useRequestValues = $wgRequest->getVal( 'type' ) == UserRestriction::NAMESPACE; |
| 148 | 148 | $legend = wfMsgHtml( 'restrictuser-legend-namespace' ); |
| 149 | | - $wgOut->addHTML( "<fieldset><legend>{$legend}</legend>" ); |
| | 149 | + $wgOut->addHTML( Xml::fieldset( $legend ) ); |
| 150 | 150 | if( $error ) |
| 151 | 151 | $wgOut->addHTML( '<strong class="error">' . $error . '</strong>' ); |
| 152 | 152 | if( $success ) |
| Index: trunk/phase3/includes/specials/SpecialRemoveRestrictions.php |
| — | — | @@ -17,8 +17,6 @@ |
| 18 | 18 | return; |
| 19 | 19 | } |
| 20 | 20 | |
| 21 | | - $legend = wfMsgHtml( 'removerestrictions-legend' ); |
| 22 | | - |
| 23 | 21 | $form = array(); |
| 24 | 22 | $form['removerestrictions-user'] = $sk->userLink( $r->getSubjectId(), $r->getSubjectText() ) . |
| 25 | 23 | $sk->userToolLinks( $r->getSubjectId(), $r->getSubjectText() ); |
| — | — | @@ -34,7 +32,7 @@ |
| 35 | 33 | $result = wfSpecialRemoveRestrictionsProcess( $r ); |
| 36 | 34 | |
| 37 | 35 | $wgOut->addWikiMsg( 'removerestrictions-intro' ); |
| 38 | | - $wgOut->addHTML( "<fieldset><legend>{$legend}</legend>" ); |
| | 36 | + $wgOut->addHTML( Xml::fieldset( wfMsgHtml( 'removerestrictions-legend' ) ) ); |
| 39 | 37 | if( $result ) |
| 40 | 38 | $wgOut->addHTML( '<strong class="success">' . wfMsgExt( 'removerestrictions-success', |
| 41 | 39 | 'parseinline', $r->getSubjectText() ) . '</strong>' ); |
| Index: trunk/phase3/includes/specials/SpecialListUserRestrictions.php |
| — | — | @@ -25,8 +25,7 @@ |
| 26 | 26 | public function getHTML() { |
| 27 | 27 | global $wgRequest, $wgScript, $wgTitle; |
| 28 | 28 | $s = ''; |
| 29 | | - $legend = wfMsgHtml( 'listuserrestrictions-legend' ); |
| 30 | | - $s .= "<fieldset><legend>{$legend}</legend>"; |
| | 29 | + $s .= Xml::fieldset( wfMsg( 'listuserrestrictions-legend' ) ); |
| 31 | 30 | $s .= "<form action=\"{$wgScript}\">"; |
| 32 | 31 | $s .= Xml::hidden( 'title', $wgTitle->getPrefixedDbKey() ); |
| 33 | 32 | $s .= Xml::label( wfMsgHtml( 'listuserrestrictions-type' ), 'type' ) . ' ' . |
| — | — | @@ -40,7 +39,7 @@ |
| 41 | 40 | $s .= ' '; |
| 42 | 41 | $s .= Xml::inputLabel( wfMsgHtml( 'listuserrestrictions-page' ), 'page', 'page', |
| 43 | 42 | false, $wgRequest->getVal( 'page' ) ); |
| 44 | | - $s .= Xml::submitButton( wfMsgHtml( 'listuserrestrictions-submit' ) ); |
| | 43 | + $s .= Xml::submitButton( wfMsg( 'listuserrestrictions-submit' ) ); |
| 45 | 44 | $s .= "</p></form></fieldset>"; |
| 46 | 45 | return $s; |
| 47 | 46 | } |