From 5842d0aa075c02c300805f97a98b2f6389145f46 Mon Sep 17 00:00:00 2001 From: withoutaname Date: Thu, 12 Jun 2014 12:45:54 -0700 Subject: [PATCH] Remove $wgFileStore Change-Id: I58cf67ac1f2754a472b49b0b6d7f2b289deb2d4a --- RELEASE-NOTES-1.24 | 2 ++ includes/DefaultSettings.php | 5 ----- includes/Setup.php | 10 +--------- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24 index f4acc374a4..bdbd6118e5 100644 --- a/RELEASE-NOTES-1.24 +++ b/RELEASE-NOTES-1.24 @@ -33,6 +33,8 @@ production. of search, you should use something like CirrusSearch instead of built in search. * Users in the 'sysop' group have access to Special:MergeHistory by default. +* $wgFileStore was removed after having been deprecated in 1.17. Alternative + configurations are $wgDeletedDirectory and $wgHashedUploadDirectory. === New features in 1.24 === * Added a new hook, "WhatLinksHereProps", to allow extensions to annotate diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 51ebd57bae..96ef14fb43 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -355,11 +355,6 @@ $wgEnableAsyncUploads = false; */ $wgIllegalFileChars = ":"; -/** - * @deprecated since 1.17 use $wgDeletedDirectory - */ -$wgFileStore = array(); - /** * What directory to place deleted uploads in. * Defaults to "{$wgUploadDirectory}/deleted". diff --git a/includes/Setup.php b/includes/Setup.php index 145f55a6d0..38a16c56d1 100644 --- a/includes/Setup.php +++ b/includes/Setup.php @@ -110,10 +110,6 @@ if ( $wgGitInfoCacheDirectory === false && $wgCacheDirectory !== false ) { $wgGitInfoCacheDirectory = "{$wgCacheDirectory}/gitinfo"; } -if ( isset( $wgFileStore['deleted']['directory'] ) ) { - $wgDeletedDirectory = $wgFileStore['deleted']['directory']; -} - if ( isset( $wgFooterIcons['copyright'] ) && isset( $wgFooterIcons['copyright']['copyright'] ) && $wgFooterIcons['copyright']['copyright'] === array() @@ -173,11 +169,7 @@ $wgLockManagers[] = array( * Initialise $wgLocalFileRepo from backwards-compatible settings */ if ( !$wgLocalFileRepo ) { - if ( isset( $wgFileStore['deleted']['hash'] ) ) { - $deletedHashLevel = $wgFileStore['deleted']['hash']; - } else { - $deletedHashLevel = $wgHashedUploadDirectory ? 3 : 0; - } + $deletedHashLevel = $wgHashedUploadDirectory ? 3 : 0; $wgLocalFileRepo = array( 'class' => 'LocalRepo', 'name' => 'local', -- 2.20.1