| Index: trunk/phase3/includes/LogEventsList.php |
| — | — | @@ -395,6 +395,7 @@ |
| 396 | 396 | } else { |
| 397 | 397 | $out->addWikiMsg( 'logempty' ); |
| 398 | 398 | } |
| | 399 | + return $pager->getNumRows(); |
| 399 | 400 | } |
| 400 | 401 | |
| 401 | 402 | /** |
| Index: trunk/phase3/includes/specials/SpecialBlockip.php |
| — | — | @@ -418,8 +418,12 @@ |
| 419 | 419 | } |
| 420 | 420 | |
| 421 | 421 | function showLogFragment( $out, $title ) { |
| | 422 | + global $wgUser; |
| 422 | 423 | $out->addHtml( Xml::element( 'h2', NULL, LogPage::logName( 'block' ) ) ); |
| 423 | | - LogEventsList::showLogExtract( $out, 'block', $title->getPrefixedText() ); |
| | 424 | + $count = LogEventsList::showLogExtract( $out, 'block', $title->getPrefixedText(), '', 10 ); |
| | 425 | + if($count > 10){ |
| | 426 | + $out->addHtml( $wgUser->getSkin()->link(Title::newFromText('Special:Log/block'), wfMsg('blocklog-fulllog'), array(), array('type' => 'block', 'page' => $title->getPrefixedText()), array('known') ) ); |
| | 427 | + } |
| 424 | 428 | } |
| 425 | 429 | |
| 426 | 430 | /** |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -2520,6 +2520,7 @@ |
| 2521 | 2521 | 'autoblocker' => 'Autoblocked because your IP address has been recently used by "[[User:$1|$1]]". |
| 2522 | 2522 | The reason given for $1\'s block is: "$2"', |
| 2523 | 2523 | 'blocklogpage' => 'Block log', |
| | 2524 | +'blocklog-fulllog' => 'Full block log', |
| 2524 | 2525 | 'blocklogentry' => 'blocked [[$1]] with an expiry time of $2 $3', |
| 2525 | 2526 | 'blocklogtext' => 'This is a log of user blocking and unblocking actions. |
| 2526 | 2527 | Automatically blocked IP addresses are not listed. |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -207,6 +207,7 @@ |
| 208 | 208 | * (bug 15598) Special:Newpages default limit uses user preference for recentchanges |
| 209 | 209 | limit instead of hardcoded 50. |
| 210 | 210 | * (bug 15617) $wgFeedClassesOutputPage::getHeadLinks() respects $wgFeedClasses, instead of hardcoding rss and atom. Patch by Juliano F. Ravasi. |
| | 211 | +* (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. |
| 211 | 212 | |
| 212 | 213 | === API changes in 1.14 === |
| 213 | 214 | |