| Index: trunk/extensions/SpamBlacklist/SpamBlacklist_body.php |
| — | — | @@ -330,12 +330,9 @@ |
| 331 | 331 | } |
| 332 | 332 | |
| 333 | 333 | function getHTTP( $url ) { |
| 334 | | - // Use wfGetHTTP from MW 1.5 if it is available |
| 335 | | - global $IP; |
| 336 | | - include_once( "$IP/includes/HttpFunctions.php" ); |
| 337 | 334 | wfSuppressWarnings(); |
| 338 | | - if ( function_exists( 'wfGetHTTP' ) ) { |
| 339 | | - $text = wfGetHTTP( $url ); |
| | 335 | + if ( function_exists( 'Http::get' ) ) { |
| | 336 | + $text = Http::get( $url ); |
| 340 | 337 | } else { |
| 341 | 338 | $url_fopen = ini_set( 'allow_url_fopen', 1 ); |
| 342 | 339 | $text = file_get_contents( $url ); |
| Index: trunk/extensions/LuceneSearch/LuceneSearch_body.php |
| — | — | @@ -798,7 +798,7 @@ |
| 799 | 799 | wfDebug( "Fetching search data from $searchUrl\n" ); |
| 800 | 800 | wfSuppressWarnings(); |
| 801 | 801 | wfProfileIn( $fname.'-contact-'.$host ); |
| 802 | | - $data = wfGetHTTP( $searchUrl ); |
| | 802 | + $data = Http::get( $searchUrl ); |
| 803 | 803 | wfProfileOut( $fname.'-contact-'.$host ); |
| 804 | 804 | wfRestoreWarnings(); |
| 805 | 805 | |
| Index: trunk/extensions/DoubleWiki/DoubleWiki.php |
| — | — | @@ -54,7 +54,7 @@ |
| 55 | 55 | $myLanguage = $wgLang->getLanguageName( $wgContLanguageCode ); |
| 56 | 56 | |
| 57 | 57 | $sep = ( in_string( '?', $url ) ) ? '&' : '?'; |
| 58 | | - $translation = wfGetHttp( $url.$sep.'action=render' ); |
| | 58 | + $translation = Http::get( $url.$sep.'action=render' ); |
| 59 | 59 | if ( $translation !== null ) { |
| 60 | 60 | #first find all links that have no 'class' parameter. |
| 61 | 61 | #these links are local so we add '?match=xx' to their url, |