| Index: trunk/phase3/RELEASE-NOTES-1.19 |
| — | — | @@ -15,6 +15,9 @@ |
| 16 | 16 | === New features in 1.19 === |
| 17 | 17 | * (bug 19838) Possibility to get all interwiki prefixes if the interwiki |
| 18 | 18 | cache is used. |
| | 19 | +* $wgDnsBlacklistUrls now accepts an array with url and key as the |
| | 20 | + elements to work with DNSBLs that require keys, such as |
| | 21 | + Project Honeypot. |
| 19 | 22 | |
| 20 | 23 | === Bug fixes in 1.19 === |
| 21 | 24 | * $wgUploadNavigationUrl should be used for file redlinks if |
| Index: trunk/phase3/includes/User.php |
| — | — | @@ -1339,7 +1339,17 @@ |
| 1340 | 1340 | |
| 1341 | 1341 | foreach( (array)$bases as $base ) { |
| 1342 | 1342 | # Make hostname |
| 1343 | | - $host = "$ipReversed.$base"; |
| | 1343 | + # If we have an access key, use that too (ProjectHoneypot, etc.) |
| | 1344 | + if( is_array( $base ) ) { |
| | 1345 | + if( count( $base ) >= 2 ) { |
| | 1346 | + # Access key is 1, base URL is 0 |
| | 1347 | + $host = "{$base[1]}.$ipReversed.{$base[0]}"; |
| | 1348 | + } else { |
| | 1349 | + $host = "$ipReversed.{$base[0]}"; |
| | 1350 | + } |
| | 1351 | + } else { |
| | 1352 | + $host = "$ipReversed.$base"; |
| | 1353 | + } |
| 1344 | 1354 | |
| 1345 | 1355 | # Send query |
| 1346 | 1356 | $ipList = gethostbynamel( $host ); |