summaryrefslogtreecommitdiff
path: root/includes/libs/virtualrest/SwiftVirtualRESTService.php
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2015-12-17 09:15:42 +0100
committerPierre Schmitz <pierre@archlinux.de>2015-12-17 09:44:51 +0100
commita1789ddde42033f1b05cc4929491214ee6e79383 (patch)
tree63615735c4ddffaaabf2428946bb26f90899f7bf /includes/libs/virtualrest/SwiftVirtualRESTService.php
parent9e06a62f265e3a2aaabecc598d4bc617e06fa32d (diff)
Update to MediaWiki 1.26.0
Diffstat (limited to 'includes/libs/virtualrest/SwiftVirtualRESTService.php')
-rw-r--r--includes/libs/virtualrest/SwiftVirtualRESTService.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/includes/libs/virtualrest/SwiftVirtualRESTService.php b/includes/libs/virtualrest/SwiftVirtualRESTService.php
index 011dabe0..88b0e1f1 100644
--- a/includes/libs/virtualrest/SwiftVirtualRESTService.php
+++ b/includes/libs/virtualrest/SwiftVirtualRESTService.php
@@ -45,7 +45,11 @@ class SwiftVirtualRESTService extends VirtualRESTService {
* - swiftAuthTTL : Swift authentication TTL (seconds)
*/
public function __construct( array $params ) {
- parent::__construct( $params );
+ // set up defaults and merge them with the given params
+ $mparams = array_merge( array(
+ 'name' => 'swift'
+ ), $params );
+ parent::__construct( $mparams );
}
/**