diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
| commit | 1de335ad3f395ca6861085393ba366a9e3fb4a0d (patch) | |
| tree | f1fdd326034e05177596851be6a7127615d81498 /includes/site/MediaWikiSite.php | |
| parent | 9c75fa8ff6d4d38ef552c00fef5969fb154765e8 (diff) | |
| parent | f6d65e533c62f6deb21342d4901ece24497b433e (diff) | |
Merge commit 'f6d65'
# Conflicts:
# skins/ArchLinux/ArchLinux.php
Diffstat (limited to 'includes/site/MediaWikiSite.php')
| -rw-r--r-- | includes/site/MediaWikiSite.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/site/MediaWikiSite.php b/includes/site/MediaWikiSite.php index 9711f042..95631f8e 100644 --- a/includes/site/MediaWikiSite.php +++ b/includes/site/MediaWikiSite.php @@ -116,7 +116,7 @@ class MediaWikiSite extends Site { // Make sure the string is normalized into NFC (due to the bug 40017) // but do nothing to the whitespaces, that should work appropriately. // @see https://bugzilla.wikimedia.org/show_bug.cgi?id=40017 - $pageName = UtfNormal::cleanUp( $pageName ); + $pageName = UtfNormal\Validator::cleanUp( $pageName ); // Build the args for the specific call $args = array( @@ -137,7 +137,7 @@ class MediaWikiSite extends Site { // Go on call the external site // @todo we need a good way to specify a timeout here. - $ret = Http::get( $url ); + $ret = Http::get( $url, array(), __METHOD__ ); } if ( $ret === false ) { |