* Tooltips for print version and permalink
* Links to the MediaWiki namespace for system messages having their default
values are no longer shown as nonexistent (e.g., in red)
+* Special:Ipblocklist differentiates between empty list and no search results.
== Maintenance script changes since 1.10 ==
}
}
- # TODO: difference message between
- # a) an real empty list and
- # b) requested ip/username not on list
$pager = new IPBlocklistPager( $this, $conds );
if ( $pager->getNumRows() ) {
- $s = $this->searchForm() .
- $pager->getNavigationBar();
- $s .= "<ul>" .
- $pager->getBody() .
- "</ul>";
- $s .= $pager->getNavigationBar();
+ $wgOut->addHTML(
+ $this->searchForm() .
+ $pager->getNavigationBar() .
+ Xml::tags( 'ul', null, $pager->getBody() ) .
+ $pager->getNavigationBar()
+ );
+ } elseif ( $this->ip != '') {
+ $wgOut->addHTML( $this->searchForm() );
+ $wgOut->addWikiText( wfMsg( 'ipblocklist-no-results' ) );
} else {
- $s = $this->searchForm() .
- '<p>' . wfMsgHTML( 'ipblocklistempty' ) . '</p>';
+ $wgOut->addWikiText( wfMsg( 'ipblocklist-empty' ) );
}
- $wgOut->addHTML( $s );
}
function searchForm() {
'anononlyblock' => 'anon. only',
'noautoblockblock' => 'autoblock disabled',
'createaccountblock' => 'account creation blocked',
-'ipblocklistempty' => 'The blocklist is empty or the requested IP address/username is not blocked.',
+'ipblocklist-empty' => 'The blocklist is empty.',
+'ipblocklist-no-results' => 'The requested IP address or username is not blocked.',
'blocklink' => 'block',
'unblocklink' => 'unblock',
'contribslink' => 'contribs',