Revert r40838 -- patch is very scary and builds its links bizarrely

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a8652ae..b119e13 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -206,7 +206,6 @@ 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 6d26410..5f4fa72 100644 (file)
--- a/includes/LogEventsList.php
+++ b/includes/LogEventsList.php
@@ -395,7 +395,6 @@ class LogEventsList {
                } else {
                        $out->addWikiMsg( 'logempty' );
                }
-               return $pager->getNumRows();
        }
 
         /**

diff --git a/includes/specials/SpecialBlockip.php b/includes/specials/SpecialBlockip.php
index 754d13d..226be10 100644 (file)
--- a/includes/specials/SpecialBlockip.php
+++ b/includes/specials/SpecialBlockip.php
@@ -419,11 +419,7 @@ class IPBlockForm {
 
        function showLogFragment( $out, $title ) {
                $out->addHtml( Xml::element( 'h2', NULL, LogPage::logName( 'block' ) ) );
-               $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') ) );
-               }
+               LogEventsList::showLogExtract( $out, 'block', $title->getPrefixedText() );
        }
 
        /**

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 172bf73..3e4cc31 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2515,7 +2515,6 @@ 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.