http://www.mediawiki.org/wiki/Special:Code/MediaWiki/69007
Revision: 69007
Author: demon
Date: 2010-07-04 15:56:46 +0000 (Sun, 04 Jul 2010)
Log Message:
-----------
Deprecated $wgFileStore in favor of $wgDeletedDirectory. Included b/c code for
wikis with $wgFileStore still set
Modified Paths:
--------------
trunk/phase3/RELEASE-NOTES
trunk/phase3/includes/DefaultSettings.php
trunk/phase3/includes/Setup.php
Modified: trunk/phase3/RELEASE-NOTES
===================================================================
--- trunk/phase3/RELEASE-NOTES 2010-07-04 15:52:19 UTC (rev 69006)
+++ trunk/phase3/RELEASE-NOTES 2010-07-04 15:56:46 UTC (rev 69007)
@@ -40,6 +40,10 @@
* 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
Modified: trunk/phase3/includes/DefaultSettings.php
===================================================================
--- trunk/phase3/includes/DefaultSettings.php 2010-07-04 15:52:19 UTC (rev
69006)
+++ trunk/phase3/includes/DefaultSettings.php 2010-07-04 15:56:46 UTC (rev
69007)
@@ -281,19 +281,16 @@
$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.
*/
$wgImgAuthDetails = false;
Modified: trunk/phase3/includes/Setup.php
===================================================================
--- trunk/phase3/includes/Setup.php 2010-07-04 15:52:19 UTC (rev 69006)
+++ trunk/phase3/includes/Setup.php 2010-07-04 15:56:46 UTC (rev 69007)
@@ -54,9 +54,10 @@
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 @@
* 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 @@
'hashLevels' => $wgHashedUploadDirectory ? 2 : 0,
'thumbScriptUrl' => $wgThumbnailScriptPath,
'transformVia404' => !$wgGenerateThumbnailOnParse,
- 'deletedDir' => $wgFileStore['deleted']['directory'],
- 'deletedHashLevels' => $wgFileStore['deleted']['hash']
+ 'deletedDir' => $wgDeletedDirectory,
+ 'deletedHashLevels' => $deletedHashLevel
);
}
/**
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
