| Index: trunk/phase3/includes/filerepo/backend/FileBackend.php |
| — | — | @@ -53,13 +53,11 @@ |
| 54 | 54 | public function __construct( array $config ) { |
| 55 | 55 | $defaultConfig = array( |
| 56 | 56 | 'lockManager' => null, |
| | 57 | + 'wikiId' => wfWikiID(), |
| 57 | 58 | ); |
| 58 | 59 | $config = array_merge( $defaultConfig, $config ); |
| 59 | 60 | $this->name = $config['name']; |
| 60 | | - $this->wikiId = isset( $config['wikiId'] ) |
| 61 | | - ? $config['wikiId'] |
| 62 | | - : wfWikiID(); // e.g. "my_wiki-en_" |
| 63 | | - $this->wikiId = $this->resolveWikiId( $this->wikiId ); |
| | 61 | + $this->wikiId = $this->resolveWikiId( $config['wikiId'] ); |
| 64 | 62 | $this->lockManager = LockManagerGroup::singleton()->get( $config['lockManager'] ); |
| 65 | 63 | $this->readOnly = isset( $config['readOnly'] ) |
| 66 | 64 | ? (string)$config['readOnly'] |