* (bug 4434) Show block log fragment on Special:Blockip

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c74da84..d3dbcbd 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -166,6 +166,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Include SVN revision number in {{CURRENTVERSION}} output, where applicable
 * Fix bug in wfRunHooks which caused corruption of objects in the hook list
 * (bug 4979) Use simplified email addresses when running on Windows
+* (bug 4434) Show block log fragment on Special:Blockip
 
 == Languages updated ==
 

diff --git a/includes/SpecialBlockip.php b/includes/SpecialBlockip.php
index 335ad97..4eb4957 100644 (file)
--- a/includes/SpecialBlockip.php
+++ b/includes/SpecialBlockip.php
@@ -165,6 +165,13 @@ class IPBlockForm {
        <input type='hidden' name='wpEditToken' value=\"{$token}\" />
 </form>\n" );
 
+               $user = User::newFromName( $this->BlockAddress );
+               if( is_object( $user ) ) {
+                       $this->showLogFragment( $wgOut, $user->getUserPage() );
+               } elseif( preg_match( '/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/', $this->BlockAddress ) ) {
+                       $this->showLogFragment( $wgOut, Title::makeTitle( NS_USER, $this->BlockAddress ) );
+               }
+       
        }
 
        function doSubmit() {
@@ -267,6 +274,14 @@ class IPBlockForm {
                $text = wfMsg( 'blockipsuccesstext', $this->BlockAddress );
                $wgOut->addWikiText( $text );
        }
+       
+       function showLogFragment( &$out, &$title ) {
+               $out->addHtml( wfElement( 'h2', NULL, LogPage::logName( 'block' ) ) );
+               $request = new FauxRequest( array( 'page' => $title->getPrefixedText(), 'type' => 'block' ) );
+               $viewer = new LogViewer( new LogReader( $request ) );
+               $viewer->showList( $out );
+       }
+       
 }
 
 ?>