http://www.mediawiki.org/wiki/Special:Code/MediaWiki/84538

Revision: 84538
Author:   happy-melon
Date:     2011-03-22 17:26:32 +0000 (Tue, 22 Mar 2011)
Log Message:
-----------
Fix "$1 is already blocked" parameter-not-passed-to-message error

Modified Paths:
--------------
    trunk/phase3/includes/specials/SpecialBlock.php

Modified: trunk/phase3/includes/specials/SpecialBlock.php
===================================================================
--- trunk/phase3/includes/specials/SpecialBlock.php     2011-03-22 17:24:39 UTC 
(rev 84537)
+++ trunk/phase3/includes/specials/SpecialBlock.php     2011-03-22 17:26:32 UTC 
(rev 84538)
@@ -557,7 +557,7 @@
                if( !$status ) {
                        # Show form unless the user is already aware of this...
                        if( !$data['AlreadyBlocked'] ) {
-                               return array( array( 'ipb_already_blocked', 
$data['Target'] ) );
+                               return array( array( 'ipb_already_blocked', 
$block->getTarget() ) );
                        # Otherwise, try to update the block...
                        } else {
                                # This returns direct blocks before 
autoblocks/rangeblocks, since we should
@@ -565,7 +565,7 @@
                                $currentBlock = Block::newFromTarget( $target );
 
                                if( $block->equals( $currentBlock ) ) {
-                                       return array( 'ipb_already_blocked' );
+                                       return array( array( 
'ipb_already_blocked', $block->getTarget() ) );
                                }
 
                                # If the name was hidden and the blocking user 
cannot hide


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to