From 528897ee865756b0ac13b3300e1d08c16f282ef5 Mon Sep 17 00:00:00 2001 From: Antoine Musso Date: Mon, 23 Jan 2012 10:59:02 +0000 Subject: [PATCH] get a null lock manager by default --- includes/filerepo/backend/FileBackend.php | 4 ++++ .../filerepo/backend/lockmanager/LockManagerGroup.php | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/includes/filerepo/backend/FileBackend.php b/includes/filerepo/backend/FileBackend.php index ee0d31210c..dcd0317ae0 100644 --- a/includes/filerepo/backend/FileBackend.php +++ b/includes/filerepo/backend/FileBackend.php @@ -51,6 +51,10 @@ abstract class FileBackendBase { * @param $config Array */ public function __construct( array $config ) { + $defaultConfig = array( + 'lockManager' => null, + ); + $config = array_merge( $defaultConfig, $config ); $this->name = $config['name']; $this->wikiId = isset( $config['wikiId'] ) ? $config['wikiId'] diff --git a/includes/filerepo/backend/lockmanager/LockManagerGroup.php b/includes/filerepo/backend/lockmanager/LockManagerGroup.php index 3fa91d581d..a3705ada6c 100644 --- a/includes/filerepo/backend/lockmanager/LockManagerGroup.php +++ b/includes/filerepo/backend/lockmanager/LockManagerGroup.php @@ -66,11 +66,14 @@ class LockManagerGroup { /** * Get the lock manager object with a given name * - * @param $name string - * @return LockManager + * @param $name string. Empty value (default) will give a nullLockManager + * @return LockManager (default: nullLockManager) * @throws MWException */ - public function get( $name ) { + public function get( $name = null ) { + if( empty( $name ) ) { + $name = 'nullLockManager'; + } if ( !isset( $this->managers[$name] ) ) { throw new MWException( "No lock manager defined with the name `$name`." ); } -- 2.20.1