Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* (bug 33101) Viewing a User or User talk of username resembling IP ending with .xxx causes Internal error

Browse source 
Patch by Brad Jorsch

Also simplify double return null in method
This commit is contained in:
Sam Reed 2011-12-15 18:57:53 +00:00
parent 451af61e33
commit 85ee2d2db2
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RELEASE-NOTES-1.19
View file

@ -183,6 +183,8 @@ production.
* (bug 32960) Remove EmailAuthenticationTimestamp from database when a
email address is removed.
* (bug 32414) Empty page get a empty bytes attribute in Export/Dump.
* (bug 33101) Viewing a User or User talk of username resembling IP ending
with .xxx causes Internal error
=== API changes in 1.19 ===
* (bug 19838) siprop=interwikimap can now use the interwiki cache.

11
includes/Block.php
View file

@ -430,7 +430,7 @@ class Block {
$row = $this->getDatabaseArray();
$row['ipb_id'] = $dbw->nextSequenceValue("ipblocks_ipb_id_seq");
$dbw->insert(
'ipblocks',
$row,
@ -969,7 +969,7 @@ class Block {
*/
public static function formatExpiry( $encoded_expiry ) {
wfDeprecated( __METHOD__, '1.18' );
global $wgContLang;
static $msg = null;
@ -1039,7 +1039,7 @@ class Block {
# 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 );
@ -1049,12 +1049,9 @@ class Block {
if( $block->newLoad( $vagueTarget ) ){
return $block;
} else {
return null;
}
} else {
return null;
}
return null;
}
/**