From df8ab5b2a7fc8772f34b250b920c47240bcb074b Mon Sep 17 00:00:00 2001
From: Domas Mituzas <midom@users.mediawiki.org>
Date: Sun, 10 Jan 2010 10:19:25 +0000
Subject: [PATCH] Add $wgExtensionAssetsPath, to decouple js/css/etc serving
 from $wgScriptPath

---
 RELEASE-NOTES                | 2 ++
 includes/DefaultSettings.php | 4 +++-
 includes/Setup.php           | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4fb568c4f6..11434aa08e 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -88,6 +88,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   signatures. This was always the behaviour documented in DefaultSettings.php
   but has not been the actual behaviour for some time: instead, UTC was used 
   by default.
+* Added $wgExtensionAssetsPath, to decouple assets serving from $wgScriptPath.
+  If not specified it will default to $wgScriptPath/extensions
 
 
 === New features in 1.16 ===
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index fb50b72c7c..52e86e9f9d 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -142,9 +142,11 @@ $wgRedirectScript   = false; ///< defaults to "{$wgScriptPath}/redirect{$wgScrip
  * splitting style sheets or images outside the main document root.
  */
 /**
- * style path as seen by users
+ * asset paths as seen by users
  */
 $wgStylePath   = false; ///< defaults to "{$wgScriptPath}/skins"
+$wgExtensionAssetsPath = false; ///< defaults to "{$wgScriptPath}/extensions"
+
 /**
  * filesystem stylesheets directory
  */
diff --git a/includes/Setup.php b/includes/Setup.php
index 1bc2dba742..4887038e3f 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -40,6 +40,7 @@ if( $wgArticlePath === false ) {
 
 if( $wgStylePath === false ) $wgStylePath = "$wgScriptPath/skins";
 if( $wgStyleDirectory === false) $wgStyleDirectory   = "$IP/skins";
+if( $wgExtensionAssetsPath === false ) $wgExtensionAssetsPath = "$wgScriptPath/extensions";
 
 if( $wgLogo === false ) $wgLogo = "$wgStylePath/common/images/wiki.png";
 
-- 
2.20.1