From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 18 Jul 2012 20:12:16 +0000 (-0700)
Subject: [FileBackend] Make sure multiwrite sub-backends use the proxy backend wiki ID.
X-Git-Tag: 1.31.0-rc.0~23003
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/ajouter.php?a=commitdiff_plain;h=ebe540f469bccb0aea63e4ae6c3d6fc895fd2e75;p=lhc%2Fweb%2Fwiklou.git

[FileBackend] Make sure multiwrite sub-backends use the proxy backend wiki ID.

Change-Id: I886b0aeb891a108e3a61e9d98e70b5a0bdc2bdc5
---

diff --git a/includes/filerepo/backend/FileBackendMultiWrite.php b/includes/filerepo/backend/FileBackendMultiWrite.php
index 0f67cf1117..e0873d276f 100644
--- a/includes/filerepo/backend/FileBackendMultiWrite.php
+++ b/includes/filerepo/backend/FileBackendMultiWrite.php
@@ -89,6 +89,7 @@ class FileBackendMultiWrite extends FileBackend {
 			// Alter certain sub-backend settings for sanity
 			unset( $config['readOnly'] ); // use proxy backend setting
 			unset( $config['fileJournal'] ); // use proxy backend journal
+			$config['wikiId'] = $this->wikiId; // use the proxy backend wiki ID
 			$config['lockManager'] = 'nullLockManager'; // lock under proxy backend
 			if ( !empty( $config['isMultiMaster'] ) ) {
 				if ( $this->masterIndex >= 0 ) {