https://www.mediawiki.org/wiki/Special:Code/MediaWiki/106355
Revision: 106355
Author: reedy
Date: 2011-12-15 18:58:19 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
* (bug 33101) Viewing a User or User talk of username resembling IP ending
with .xxx causes Internal error
Essentially a merge of r106354
Modified Paths:
--------------
branches/wmf/1.18wmf1/includes/Block.php
Modified: branches/wmf/1.18wmf1/includes/Block.php
===================================================================
--- branches/wmf/1.18wmf1/includes/Block.php 2011-12-15 18:57:53 UTC (rev
106354)
+++ branches/wmf/1.18wmf1/includes/Block.php 2011-12-15 18:58:19 UTC (rev
106355)
@@ -1028,7 +1028,7 @@
# passed by some callers (bug 29116)
return null;
- } elseif( in_array( $type, array( Block::TYPE_USER,
Block::TYPE_IP, Block::TYPE_RANGE, null ) ) ) {
+ } elseif( in_array( $type, array( Block::TYPE_USER,
Block::TYPE_IP, Block::TYPE_RANGE ) ) ) {
$block = new Block();
$block->fromMaster( $fromMaster );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
