From: Rob Church <robchurch@users.mediawiki.org>
Date: Wed, 12 Jul 2006 03:18:42 +0000 (+0000)
Subject: * (bug 6639) Use a consistent default for upload directories
X-Git-Tag: 1.31.0-rc.0~56283
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=e58b76b37aff2e03ee0e48e6de2b8f457d1e4721;p=lhc%2Fweb%2Fwiklou.git

* (bug 6639) Use a consistent default for upload directories
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index bb798fc6e6..1d2c8ab444 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -57,7 +57,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Fix regression in blocking of user accounts
 * (bug 6635) Fix regression searching for range blocks on Ipblocklist
 * Fix regression searching Ipblocklist with ugly URLs
-
+* (bug 6639) Use a consistent default for upload directories
 
 == Languages updated ==
 
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index f6591adca7..7148555ec9 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -115,8 +115,8 @@ $wgStylePath   = "{$wgScriptPath}/skins";
 $wgStyleDirectory = "{$IP}/skins";
 $wgStyleSheetPath = &$wgStylePath;
 $wgArticlePath      = "{$wgScript}?title=$1";
-$wgUploadPath       = "{$wgScriptPath}/upload";
-$wgUploadDirectory	= "{$IP}/upload";
+$wgUploadPath       = "{$wgScriptPath}/images";
+$wgUploadDirectory	= "{$IP}/images";
 $wgHashedUploadDirectory	= true;
 $wgLogo				= "{$wgUploadPath}/wiki.png";
 $wgFavicon			= '/favicon.ico';