Deprecated $wgFileStore in favor of $wgDeletedDirectory. Included b/c code for wikis...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2881760..a648877 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -40,6 +40,10 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * XmlFunctions.php has been removed. Use the Xml or Html classes as appropriate.
 * Added $wgSQLMode for setting database SQL modes - either performance (null)
   or other reasons (such as enabling stricter checks)
+* $wgFileStore has been deprecated. The only usage $wgFileStore['deleted'] has
+  been turned into $wgDeletedDirectory
+* $wgDeletedDirectory has been added to specify what directory to place deleted
+  uploads in
 
 === New features in 1.17 ===
 * (bug 10183) Users can now add personal styles and scripts to all skins via

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 9c5b006..7a8deca 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -281,17 +281,14 @@ $wgAllowImageMoving = true;
 $wgIllegalFileChars = ":";
 
 /**
- * New file storage paths; currently used only for deleted files.
- * Set it like this:
- *
- *   $wgFileStore['deleted']['directory'] = '/var/wiki/private/deleted';
+ * @deprecated use $wgDeletedDirectory
  */
 $wgFileStore = array();
-/** @cond file_level_code */
-$wgFileStore['deleted']['directory'] = false; //  Defaults to $wgUploadDirectory/deleted
-$wgFileStore['deleted']['url'] = null;        //  Private
-$wgFileStore['deleted']['hash'] = 3;          //  3-level subdirectory split
-/** @endcond */
+
+/**
+ * What directory to place deleted uploads in
+ */
+$wgDeletedDirectory = false; //  Defaults to $wgUploadDirectory/deleted
 
 /**
  * Set this to true if you use img_auth and want the user to see details on why access failed.

diff --git a/includes/Setup.php b/includes/Setup.php
index 77832a1..2eb9611 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -54,9 +54,10 @@ if( $wgTmpDirectory === false ) $wgTmpDirectory = "{$wgUploadDirectory}/tmp";
 
 if( $wgReadOnlyFile === false ) $wgReadOnlyFile = "{$wgUploadDirectory}/lock_yBgMBwiR";
 if( $wgFileCacheDirectory === false ) $wgFileCacheDirectory = "{$wgUploadDirectory}/cache";
+if( $wgDeletedDirectory === false ) $wgDeletedDirectory = "{$wgUploadDirectory}/deleted";
 
-if ( empty( $wgFileStore['deleted']['directory'] ) ) {
-       $wgFileStore['deleted']['directory'] = "{$wgUploadDirectory}/deleted";
+if( isset( $wgFileStore['deleted']['directory'] ) ) {
+       $wgDeletedDirectory = $wgFileStore['deleted']['directory'];
 }
 
 /**
@@ -80,6 +81,11 @@ $wgNamespaceAliases['Image_talk'] = NS_FILE_TALK;
  * Initialise $wgLocalFileRepo from backwards-compatible settings
  */
 if ( !$wgLocalFileRepo ) {
+       if( isset( $wgFileStore['deleted']['hash'] ) ) {
+               $deletedHashLevel = $wgFileStore['deleted']['hash'];
+       } else {
+               $deletedHashLevel = $wgHashedUploadDirectory ? 3 : 0;
+       }
        $wgLocalFileRepo = array(
                'class' => 'LocalRepo',
                'name' => 'local',
@@ -90,8 +96,8 @@ if ( !$wgLocalFileRepo ) {
                'hashLevels' => $wgHashedUploadDirectory ? 2 : 0,
                'thumbScriptUrl' => $wgThumbnailScriptPath,
                'transformVia404' => !$wgGenerateThumbnailOnParse,
-               'deletedDir' => $wgFileStore['deleted']['directory'],
-               'deletedHashLevels' => $wgFileStore['deleted']['hash']
+               'deletedDir' => $wgDeletedDirectory,
+               'deletedHashLevels' => $deletedHashLevel
        );
 }
 /**