| Index: trunk/extensions/CheckUser/CheckUser_body.php |
| — | — | @@ -117,7 +117,7 @@ |
| 118 | 118 | } |
| 119 | 119 | } |
| 120 | 120 | # Add CIDR calculation convenience form |
| 121 | | - $wgOut->addHTML( $this->addJsCIDRForm() ); |
| | 121 | + $this->addJsCIDRForm(); |
| 122 | 122 | $this->addStyles(); |
| 123 | 123 | } |
| 124 | 124 | |
| — | — | @@ -221,6 +221,7 @@ |
| 222 | 222 | * Make a quick JS form for admins to calculate block ranges |
| 223 | 223 | */ |
| 224 | 224 | protected function addJsCIDRForm() { |
| | 225 | + global $wgOut; |
| 225 | 226 | $s = '<fieldset id="mw-checkuser-cidrform" style="display:none;">'. |
| 226 | 227 | '<legend>'.wfMsgHtml('checkuser-cidr-label').'</legend>'; |
| 227 | 228 | $s .= '<textarea id="mw-checkuser-iplist" rows="5" cols="50" onkeyup="updateCIDRresult()" onclick="updateCIDRresult()"></textarea><br/>'; |
| — | — | @@ -228,7 +229,7 @@ |
| 229 | 230 | Xml::input( 'mw-checkuser-cidr-res',35,'',array('id'=>'mw-checkuser-cidr-res') ) . |
| 230 | 231 | '<span id="mw-checkuser-ipnote"></span>'; |
| 231 | 232 | $s .= '</fieldset>'; |
| 232 | | - return $s; |
| | 233 | + $wgOut->addHTML( $s ); |
| 233 | 234 | } |
| 234 | 235 | |
| 235 | 236 | /** |
| — | — | @@ -314,8 +315,7 @@ |
| 315 | 316 | } |
| 316 | 317 | # IPs are passed in as a blank string |
| 317 | 318 | if( !$user ) { |
| 318 | | - $s = wfMsgHtml('nouserspecified'); |
| 319 | | - $wgOut->addHTML( $s ); |
| | 319 | + $wgOut->addWikiMsg( 'nouserspecified' ); |
| 320 | 320 | return; |
| 321 | 321 | } |
| 322 | 322 | # Get ID, works better than text as user may have been renamed |
| — | — | @@ -323,7 +323,7 @@ |
| 324 | 324 | |
| 325 | 325 | # If user is not IP or nonexistent |
| 326 | 326 | if( !$user_id ) { |
| 327 | | - $s = wfMsgExt('nosuchusershort',array('parseinline'),$user); |
| | 327 | + $s = wfMsgExt('nosuchusershort',array('parse'),$user); |
| 328 | 328 | $wgOut->addHTML( $s ); |
| 329 | 329 | return; |
| 330 | 330 | } |
| — | — | @@ -439,8 +439,7 @@ |
| 440 | 440 | $fname = 'CheckUser::doIPEditsRequest'; |
| 441 | 441 | # Invalid IPs are passed in as a blank string |
| 442 | 442 | if(!$ip) { |
| 443 | | - $s = wfMsgHtml('badipaddress'); |
| 444 | | - $wgOut->addHTML( $s ); |
| | 443 | + $wgOut->addWikiMsg( 'badipaddress' ); |
| 445 | 444 | return; |
| 446 | 445 | } |
| 447 | 446 | |
| — | — | @@ -450,7 +449,7 @@ |
| 451 | 450 | } |
| 452 | 451 | # Record check... |
| 453 | 452 | if( !$this->addLogEntry( $logType, 'ip', $ip, $reason ) ) { |
| 454 | | - $wgOut->addHTML( '<p>'.wfMsgHtml('checkuser-log-fail').'</p>' ); |
| | 453 | + $wgOut->addWikiMsg( 'checkuser-log-fail' ); |
| 455 | 454 | } |
| 456 | 455 | |
| 457 | 456 | $dbr = wfGetDB( DB_SLAVE ); |
| — | — | @@ -581,8 +580,7 @@ |
| 582 | 581 | } |
| 583 | 582 | # IPs are passed in as a blank string |
| 584 | 583 | if( !$user ) { |
| 585 | | - $s = wfMsgHtml('nouserspecified'); |
| 586 | | - $wgOut->addHTML( $s ); |
| | 584 | + $wgOut->addWikiMsg( 'nouserspecified' ); |
| 587 | 585 | return; |
| 588 | 586 | } |
| 589 | 587 | # Get ID, works better than text as user may have been renamed |
| — | — | @@ -590,7 +588,7 @@ |
| 591 | 589 | |
| 592 | 590 | # If user is not IP or nonexistent |
| 593 | 591 | if( !$user_id ) { |
| 594 | | - $s = wfMsgExt('nosuchusershort',array('parseinline'),$user); |
| | 592 | + $s = wfMsgExt('nosuchusershort',array('parse'),$user); |
| 595 | 593 | $wgOut->addHTML( $s ); |
| 596 | 594 | return; |
| 597 | 595 | } |
| — | — | @@ -705,8 +703,7 @@ |
| 706 | 704 | |
| 707 | 705 | # Invalid IPs are passed in as a blank string |
| 708 | 706 | if( !$ip ) { |
| 709 | | - $s = wfMsgHtml('badipaddress'); |
| 710 | | - $wgOut->addHTML( $s ); |
| | 707 | + $wgOut->addWikiMsg( 'badipaddress' ); |
| 711 | 708 | return; |
| 712 | 709 | } |
| 713 | 710 | |