Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Follow-up for I68b1ae842: Deprecate $wgScriptExtension as well

Browse source 
Change-Id: I3690f78bc57030d3f1e3992554ba0ae7eb393273
This commit is contained in:
Ori Livneh 2015-04-22 12:03:36 -07:00 committed by Ori.livneh
parent 51b498240f
commit 4b672d434b
3 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
RELEASE-NOTES-1.25
View file

@ -489,10 +489,11 @@ changes to languages because of Bugzilla reports.
* $wgResourceModuleSkinStyles no longer supports per-module local or remote paths. They
can only be set for the entire skin.
* Removed global function swap(). (deprecated since 1.24)
* Deprecated the ".php5" file extension entry points. Refer to the ".php" files
instead. If you want ".php5" URLs to continue to work, set up redirects. In
Apache, this can be done by enabling mod_rewrite and adding the following
rules to your configuration:
* Deprecated the ".php5" file extension entry points and the $wgScriptExtension
configuration variable. Refer to the ".php" files instead. If you want
".php5" URLs to continue to work, set up redirects. In Apache, this can be
done by enabling mod_rewrite and adding the following rules to your
configuration:
RewriteEngine On
RewriteBase /

11
includes/DefaultSettings.php
View file

@ -154,12 +154,15 @@ $wgUsePathInfo = ( strpos( PHP_SAPI, 'cgi' ) === false ) &&
( strpos( PHP_SAPI, 'isapi' ) === false );
/**
* The extension to append to script names by default. This can either be .php
* or .php5.
* The extension to append to script names by default.
*
* Some hosting providers used PHP 4 for *.php files, and PHP 5 for *.php5.
* This variable was provided to support those providers.
*
* Some hosting providers use PHP 4 for *.php files, and PHP 5 for *.php5. This
* variable is provided to support those providers.
* @since 1.11
* @deprecated since 1.25; support for '.php5' is being phased out of MediaWiki
* proper. Backward-compatibility can be maintained by configuring your web
* server to rewrite URLs. See RELEASE-NOTES for details.
*/
$wgScriptExtension = '.php';

4
includes/Setup.php
View file

@ -485,8 +485,8 @@ require_once "$IP/includes/libs/normal/UtfNormalUtil.php";
$ps_default2 = Profiler::instance()->scopedProfileIn( $fname . '-defaults2' );
if ( defined( 'MW_ENTRY_PHP5' ) ) {
wfWarn( 'The ".php5" entry point files are deprecated. Use ".php" instead.' );
if ( $wgScriptExtension !== '.php' || defined( 'MW_ENTRY_PHP5' ) ) {
wfWarn( 'Script extensions other than ".php" are deprecated.' );
}
if ( $wgCanonicalServer === false ) {