From: Antoine Musso <hashar@users.mediawiki.org>
Date: Mon, 23 Jan 2012 10:59:02 +0000 (+0000)
Subject: get a null lock manager by default
X-Git-Tag: 1.31.0-rc.0~25126
X-Git-Url: http://git.cyclocoop.org/data/%24self?a=commitdiff_plain;h=528897ee865756b0ac13b3300e1d08c16f282ef5;p=lhc%2Fweb%2Fwiklou.git

get a null lock manager by default
---

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`." );
 		}