| Index: trunk/phase3/RELEASE-NOTES-1.19 |
| — | — | @@ -183,6 +183,8 @@ |
| 184 | 184 | * (bug 32960) Remove EmailAuthenticationTimestamp from database when a |
| 185 | 185 | email address is removed. |
| 186 | 186 | * (bug 32414) Empty page get a empty bytes attribute in Export/Dump. |
| | 187 | +* (bug 33101) Viewing a User or User talk of username resembling IP ending |
| | 188 | + with .xxx causes Internal error |
| 187 | 189 | |
| 188 | 190 | === API changes in 1.19 === |
| 189 | 191 | * (bug 19838) siprop=interwikimap can now use the interwiki cache. |
| Index: trunk/phase3/includes/Block.php |
| — | — | @@ -430,7 +430,7 @@ |
| 431 | 431 | |
| 432 | 432 | $row = $this->getDatabaseArray(); |
| 433 | 433 | $row['ipb_id'] = $dbw->nextSequenceValue("ipblocks_ipb_id_seq"); |
| 434 | | - |
| | 434 | + |
| 435 | 435 | $dbw->insert( |
| 436 | 436 | 'ipblocks', |
| 437 | 437 | $row, |
| — | — | @@ -969,7 +969,7 @@ |
| 970 | 970 | */ |
| 971 | 971 | public static function formatExpiry( $encoded_expiry ) { |
| 972 | 972 | wfDeprecated( __METHOD__, '1.18' ); |
| 973 | | - |
| | 973 | + |
| 974 | 974 | global $wgContLang; |
| 975 | 975 | static $msg = null; |
| 976 | 976 | |
| — | — | @@ -1039,7 +1039,7 @@ |
| 1040 | 1040 | # passed by some callers (bug 29116) |
| 1041 | 1041 | return null; |
| 1042 | 1042 | |
| 1043 | | - } elseif( in_array( $type, array( Block::TYPE_USER, Block::TYPE_IP, Block::TYPE_RANGE, null ) ) ) { |
| | 1043 | + } elseif( in_array( $type, array( Block::TYPE_USER, Block::TYPE_IP, Block::TYPE_RANGE ) ) ) { |
| 1044 | 1044 | $block = new Block(); |
| 1045 | 1045 | $block->fromMaster( $fromMaster ); |
| 1046 | 1046 | |
| — | — | @@ -1049,12 +1049,9 @@ |
| 1050 | 1050 | |
| 1051 | 1051 | if( $block->newLoad( $vagueTarget ) ){ |
| 1052 | 1052 | return $block; |
| 1053 | | - } else { |
| 1054 | | - return null; |
| 1055 | 1053 | } |
| 1056 | | - } else { |
| 1057 | | - return null; |
| 1058 | 1054 | } |
| | 1055 | + return null; |
| 1059 | 1056 | } |
| 1060 | 1057 | |
| 1061 | 1058 | /** |