Readding 'Full Block Log' link, after being removed for not using Linker function.

Patch submitted by Matt Johnston, in bug 14638

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d410705..c52018f 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -207,6 +207,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 15598) Special:Newpages default limit uses user preference for recentchanges
   limit instead of hardcoded 50.
 * (bug 15617) $wgFeedClassesOutputPage::getHeadLinks() respects $wgFeedClasses, instead of hardcoding rss and atom. Patch by Juliano F. Ravasi. 
+* (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 5f4fa72..6d26410 100644 (file)
--- 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 226be10..a03d564 100644 (file)
--- a/includes/specials/SpecialBlockip.php
+++ b/includes/specials/SpecialBlockip.php
@@ -418,8 +418,12 @@ class IPBlockForm {
        }
 
        function showLogFragment( $out, $title ) {
+               global $wgUser;
                $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){
+                       $out->addHtml( $wgUser->getSkin()->link(Title::newFromText('Special:Log/block'), wfMsg('blocklog-fulllog'), array(), array('type' => 'block', 'page' => $title->getPrefixedText()), array('known') ) );
+               }
        }
 
        /**

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 267f2a0..27d80ff 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2520,6 +2520,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-fulllog'                => '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.