r40864 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r40863‎ | r40864 | r40865 >
Date:18:33, 15 September 2008
Author:brion
Status:old
Tags:
Comment:
Revert r40838 -- patch is very scary and builds its links bizarrely
Modified paths:
  • /trunk/phase3/RELEASE-NOTES (modified) (history)
  • /trunk/phase3/includes/LogEventsList.php (modified) (history)
  • /trunk/phase3/includes/specials/SpecialBlockip.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesEn.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/LogEventsList.php
@@ -395,7 +395,6 @@
396396 } else {
397397 $out->addWikiMsg( 'logempty' );
398398 }
399 - return $pager->getNumRows();
400399 }
401400
402401 /**
Index: trunk/phase3/includes/specials/SpecialBlockip.php
@@ -419,11 +419,7 @@
420420
421421 function showLogFragment( $out, $title ) {
422422 $out->addHtml( Xml::element( 'h2', NULL, LogPage::logName( 'block' ) ) );
423 - $count = LogEventsList::showLogExtract( $out, 'block', $title->getPrefixedText(), '', 10 );
424 - if($count > 10){
425 - $logtitle = Title::newFromText('Special:Log/block');
426 - $out->addHtml( Xml::element( 'a', array('href' => $logtitle->getFullURL(array('type' => 'block', 'page' => $title->getPrefixedText()))), wfMsg('blocklog-header') ) );
427 - }
 423+ LogEventsList::showLogExtract( $out, 'block', $title->getPrefixedText() );
428424 }
429425
430426 /**
Index: trunk/phase3/languages/messages/MessagesEn.php
@@ -2515,7 +2515,6 @@
25162516 'autoblocker' => 'Autoblocked because your IP address has been recently used by "[[User:$1|$1]]".
25172517 The reason given for $1\'s block is: "$2"',
25182518 'blocklogpage' => 'Block log',
2519 -'blocklog-header' => 'Full block log',
25202519 'blocklogentry' => 'blocked [[$1]] with an expiry time of $2 $3',
25212520 'blocklogtext' => 'This is a log of user blocking and unblocking actions.
25222521 Automatically blocked IP addresses are not listed.
Index: trunk/phase3/RELEASE-NOTES
@@ -206,7 +206,6 @@
207207 even if there are broken link records with source article id 0 in the database
208208 * (bug 15598) Special:Newpages default limit uses user preference for recentchanges
209209 limit instead of hardcoded 50.
210 -* (bug 14638) Special:Blockip now provides a link to the block log if the user has been blocked more than 10 times. Patch by Matt Johnston.
211210
212211 === API changes in 1.14 ===
213212

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r40838(bug 14638)...soxred9301:26, 15 September 2008