diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2015-06-04 07:31:04 +0200 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2015-06-04 07:58:39 +0200 |
| commit | f6d65e533c62f6deb21342d4901ece24497b433e (patch) | |
| tree | f28adf0362d14bcd448f7b65a7aaf38650f923aa /includes/externalstore | |
| parent | c27b2e832fe25651ef2410fae85b41072aae7519 (diff) | |
Update to MediaWiki 1.25.1
Diffstat (limited to 'includes/externalstore')
| -rw-r--r-- | includes/externalstore/ExternalStore.php | 2 | ||||
| -rw-r--r-- | includes/externalstore/ExternalStoreHttp.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/includes/externalstore/ExternalStore.php b/includes/externalstore/ExternalStore.php index 688130e0..ea04cc85 100644 --- a/includes/externalstore/ExternalStore.php +++ b/includes/externalstore/ExternalStore.php @@ -197,7 +197,7 @@ class ExternalStore { } try { $url = $store->store( $path, $data ); // Try to save the object - } catch ( MWException $error ) { + } catch ( Exception $error ) { $url = false; } if ( strlen( $url ) ) { diff --git a/includes/externalstore/ExternalStoreHttp.php b/includes/externalstore/ExternalStoreHttp.php index 345c17be..00030d85 100644 --- a/includes/externalstore/ExternalStoreHttp.php +++ b/includes/externalstore/ExternalStoreHttp.php @@ -31,7 +31,7 @@ class ExternalStoreHttp extends ExternalStoreMedium { * @see ExternalStoreMedium::fetchFromURL() */ public function fetchFromURL( $url ) { - return Http::get( $url ); + return Http::get( $url, array(), __METHOD__ ); } /** |