From a1789ddde42033f1b05cc4929491214ee6e79383 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 17 Dec 2015 09:15:42 +0100 Subject: Update to MediaWiki 1.26.0 --- includes/installer/LocalSettingsGenerator.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'includes/installer/LocalSettingsGenerator.php') diff --git a/includes/installer/LocalSettingsGenerator.php b/includes/installer/LocalSettingsGenerator.php index 162a7897..ddefd673 100644 --- a/includes/installer/LocalSettingsGenerator.php +++ b/includes/installer/LocalSettingsGenerator.php @@ -57,7 +57,7 @@ class LocalSettingsGenerator { $confItems = array_merge( array( - 'wgServer', 'wgScriptPath', 'wgScriptExtension', + 'wgServer', 'wgScriptPath', 'wgPasswordSender', 'wgImageMagickConvertCommand', 'wgShellLocale', 'wgLanguageCode', 'wgEnableEmail', 'wgEnableUserEmail', 'wgDiff3', 'wgEnotifUserTalk', 'wgEnotifWatchlist', 'wgEmailAuthentication', @@ -331,13 +331,12 @@ if ( !defined( 'MEDIAWIKI' ) ) { ## (like /w/index.php/Page_title to /wiki/Page_title) please see: ## https://www.mediawiki.org/wiki/Manual:Short_URL \$wgScriptPath = \"{$this->values['wgScriptPath']}\"; -\$wgScriptExtension = \"{$this->values['wgScriptExtension']}\"; ${serverSetting} -## The relative URL path to the skins directory -\$wgStylePath = \"\$wgScriptPath/skins\"; + +## The URL path to static resources (images, scripts, etc.) \$wgResourceBasePath = \$wgScriptPath; -## The relative URL path to the logo. Make sure you change this from the default, +## The URL path to the logo. Make sure you change this from the default, ## or else you'll overwrite your logo when you upgrade! \$wgLogo = \"{$this->values['wgLogo']}\"; @@ -372,7 +371,7 @@ ${serverSetting} {$magic}\$wgUseImageMagick = true; {$magic}\$wgImageMagickConvertCommand = \"{$this->values['wgImageMagickConvertCommand']}\"; -# InstantCommons allows wiki to use images from http://commons.wikimedia.org +# InstantCommons allows wiki to use images from https://commons.wikimedia.org \$wgUseInstantCommons = {$this->values['wgUseInstantCommons']}; ## If you use ImageMagick (or any other shell command) on a -- cgit v1.2.3-54-g00ecf