http://www.mediawiki.org/wiki/Special:Code/MediaWiki/90693
Revision: 90693
Author: aaron
Date: 2011-06-24 07:49:50 +0000 (Fri, 24 Jun 2011)
Log Message:
-----------
Code style cleanups, use strict comparison with $data['PreviousTarget'] per CR
Modified Paths:
--------------
trunk/phase3/includes/specials/SpecialBlock.php
Modified: trunk/phase3/includes/specials/SpecialBlock.php
===================================================================
--- trunk/phase3/includes/specials/SpecialBlock.php 2011-06-24 07:08:44 UTC
(rev 90692)
+++ trunk/phase3/includes/specials/SpecialBlock.php 2011-06-24 07:49:50 UTC
(rev 90693)
@@ -554,7 +554,8 @@
# Give admins a heads-up before they go and block
themselves. Much messier
# to do this for IPs, but it's pretty unlikely they'd
ever get the 'block'
# permission anyway, although the code does allow for it
- if( $target === $wgUser->getName() && (
$data['PreviousTarget'] != $data['Target'] || !$data['Confirm'] ) )
+ if( $target === $wgUser->getName() &&
+ ( $data['PreviousTarget'] != $data['Target'] ||
!$data['Confirm'] ) )
{
return array( 'ipb-blockingself' );
}
@@ -634,7 +635,9 @@
$status = $block->insert();
if( !$status ) {
# Show form unless the user is already aware of this...
- if( ( array_key_exists('PreviousTarget', $data ) &&
$data['PreviousTarget'] != htmlspecialchars( $block->getTarget() ) ) ||
!$data['Confirm'] ) {
+ if( !$data['Confirm'] || ( array_key_exists(
'PreviousTarget', $data )
+ && $data['PreviousTarget'] !==
htmlspecialchars( $block->getTarget() ) ) )
+ {
return array( array( 'ipb_already_blocked',
$block->getTarget() ) );
# Otherwise, try to update the block...
} else {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
