From: X! <soxred93@users.mediawiki.org>
Date: Mon, 15 Sep 2008 01:26:32 +0000 (+0000)
Subject: (bug 14638)
X-Git-Tag: 1.31.0-rc.0~45299
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=40c0744ac00bd218b964abec9f7c1adadcaeb02e;p=lhc%2Fweb%2Fwiklou.git

(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.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b119e13639..a8652ae26b 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -206,6 +206,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   even if there are broken link records with source article id 0 in the database
 * (bug 15598) Special:Newpages default limit uses user preference for recentchanges
   limit instead of hardcoded 50.
+* (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.
 
 === API changes in 1.14 ===
 
diff --git a/includes/LogEventsList.php b/includes/LogEventsList.php
index 5f4fa7251c..6d264102f2 100644
--- a/includes/LogEventsList.php
+++ b/includes/LogEventsList.php
@@ -395,6 +395,7 @@ class LogEventsList {
 		} else {
 			$out->addWikiMsg( 'logempty' );
 		}
+		return $pager->getNumRows();
 	}
 
 	 /**
diff --git a/includes/specials/SpecialBlockip.php b/includes/specials/SpecialBlockip.php
index 226be10dc6..754d13dba0 100644
--- a/includes/specials/SpecialBlockip.php
+++ b/includes/specials/SpecialBlockip.php
@@ -419,7 +419,11 @@ class IPBlockForm {
 
 	function showLogFragment( $out, $title ) {
 		$out->addHtml( Xml::element( 'h2', NULL, LogPage::logName( 'block' ) ) );
-		LogEventsList::showLogExtract( $out, 'block', $title->getPrefixedText() );
+		$count = LogEventsList::showLogExtract( $out, 'block', $title->getPrefixedText(), '', 10 );
+		if($count > 10){
+			$logtitle = Title::newFromText('Special:Log/block');
+			$out->addHtml( Xml::element( 'a', array('href' => $logtitle->getFullURL(array('type' => 'block', 'page' => $title->getPrefixedText()))), wfMsg('blocklog-header') ) );
+		}
 	}
 
 	/**
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index d6fe6b7187..e1ea9262a3 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2518,6 +2518,7 @@ See [[Special:IPBlockList|IP block list]] to review blocks.',
 'autoblocker'                     => 'Autoblocked because your IP address has been recently used by "[[User:$1|$1]]".
 The reason given for $1\'s block is: "$2"',
 'blocklogpage'                    => 'Block log',
+'blocklog-header'                 => 'Full block log',
 'blocklogentry'                   => 'blocked [[$1]] with an expiry time of $2 $3',
 'blocklogtext'                    => 'This is a log of user blocking and unblocking actions.
 Automatically blocked IP addresses are not listed.