http://www.mediawiki.org/wiki/Special:Code/MediaWiki/82850
Revision: 82850
Author: maxsem
Date: 2011-02-26 13:15:34 +0000 (Sat, 26 Feb 2011)
Log Message:
-----------
1.17 MFT r82845, r82847, r82848 and r82849 (config/ --> mw-config/)
Modified Paths:
--------------
branches/REL1_17/phase3/INSTALL
branches/REL1_17/phase3/RELEASE-NOTES
branches/REL1_17/phase3/docs/distributors.txt
branches/REL1_17/phase3/docs/scripts.txt
branches/REL1_17/phase3/includes/WebStart.php
branches/REL1_17/phase3/includes/installer/Installer.php
branches/REL1_17/phase3/includes/installer/WebInstaller.php
branches/REL1_17/phase3/includes/templates/NoLocalSettings.php
branches/REL1_17/phase3/includes/templates/PHP4.php
Added Paths:
-----------
branches/REL1_17/phase3/config/
branches/REL1_17/phase3/config/index.php
branches/REL1_17/phase3/config/index.php5
branches/REL1_17/phase3/mw-config/
Removed Paths:
-------------
branches/REL1_17/phase3/config/
branches/REL1_17/phase3/config/index.php
branches/REL1_17/phase3/config/index.php5
Property Changed:
----------------
branches/REL1_17/phase3/
branches/REL1_17/phase3/RELEASE-NOTES
branches/REL1_17/phase3/includes/
Property changes on: branches/REL1_17/phase3
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3:51646
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/trunk/phase3:79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,81657,81833
+ /branches/REL1_15/phase3:51646
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/trunk/phase3:79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,81657,81833,82845,82847-82849
Modified: branches/REL1_17/phase3/INSTALL
===================================================================
--- branches/REL1_17/phase3/INSTALL 2011-02-26 13:07:37 UTC (rev 82849)
+++ branches/REL1_17/phase3/INSTALL 2011-02-26 13:15:34 UTC (rev 82850)
@@ -65,7 +65,7 @@
way (yet) to get it after you exit the installer. Place it in the main wiki
directory, and the wiki should now be working.
-Once the wiki is set up, you should remove the config directory (though it will
+Once the wiki is set up, you should remove the mw-config directory (though it
will
refuse to config again if the wiki is set up).
----
Modified: branches/REL1_17/phase3/RELEASE-NOTES
===================================================================
--- branches/REL1_17/phase3/RELEASE-NOTES 2011-02-26 13:07:37 UTC (rev
82849)
+++ branches/REL1_17/phase3/RELEASE-NOTES 2011-02-26 13:15:34 UTC (rev
82850)
@@ -22,7 +22,9 @@
MediaWiki 1.17 is shipping with a completely redesigned installer to fix
a lot of outstanding bugs, cleanup the code quality, and make it easier to
use. Notably, you can now run upgrades from the web without having to move
-LocalSettings.php. The specific bugs are listed below in the general notes.
+LocalSettings.php. Also, configuration script directory has been renamed
+from config/ to mw-config/. The specific bugs are listed below in the
+general notes.
=== New ResourceLoader in 1.17 ===
MediaWiki 1.17 ships with a ResourceLoader which combines and minifies css and
@@ -493,6 +495,7 @@
* (bug 26208) Mark directionality of some interlanguage links
* (bug 26716) Provide link to instructions for external editor related
preferences.
* (bug 26961) Hide anon edits in watchlist preference now actually works.
+* (bug 1379) Installer directory conflicts with some hosts' configuration
panel.
=== API changes in 1.17 ===
* BREAKING CHANGE: action=patrol now requires POST
Property changes on: branches/REL1_17/phase3/RELEASE-NOTES
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/RELEASE-NOTES:51646
/branches/new-installer/phase3/RELEASE-NOTES:43664-66004
/branches/sqlite/RELEASE-NOTES:58211-58321
/trunk/phase3/HISTORY:79860,80620
/trunk/phase3/RELEASE-NOTES:79166,79324,79454-79456,79536,79557,79727,79733,79746,79773-79774,80109,80113,80163,80222-80223,80322,80324,80326,80328,80339,80350-80351,80355,80358,80362-80363,80371,80442,80475,80492,80540,80554,80575,80608,80620,80656,80666,80679,80685,80694,80728,80841,81121,81124,81186-81187,81197,81209-81211,81215,81238,81246,81262,81264,81430,81488,81496,81554,81561,81589,81600,81611,81620,81622,81640,81648,81650-81652,82810,82813-82815,82818
+ /branches/REL1_15/phase3/RELEASE-NOTES:51646
/branches/new-installer/phase3/RELEASE-NOTES:43664-66004
/branches/sqlite/RELEASE-NOTES:58211-58321
/trunk/phase3/HISTORY:79860,80620
/trunk/phase3/RELEASE-NOTES:79166,79324,79454-79456,79536,79557,79727,79733,79746,79773-79774,80109,80113,80163,80222-80223,80322,80324,80326,80328,80339,80350-80351,80355,80358,80362-80363,80371,80442,80475,80492,80540,80554,80575,80608,80620,80656,80666,80679,80685,80694,80728,80841,81121,81124,81186-81187,81197,81209-81211,81215,81238,81246,81262,81264,81430,81488,81496,81554,81561,81589,81600,81611,81620,81622,81640,81648,81650-81652,82810,82813-82815,82818,82845,82847-82848
Deleted: branches/REL1_17/phase3/config/index.php
===================================================================
--- trunk/phase3/config/index.php 2011-02-26 12:35:23 UTC (rev 82845)
+++ branches/REL1_17/phase3/config/index.php 2011-02-26 13:15:34 UTC (rev
82850)
@@ -1 +0,0 @@
-<?php require( dirname( dirname( __FILE__ ) ) . '/mw-config/index.php' );
\ No newline at end of file
Copied: branches/REL1_17/phase3/config/index.php (from rev 82845,
trunk/phase3/config/index.php)
===================================================================
--- branches/REL1_17/phase3/config/index.php (rev 0)
+++ branches/REL1_17/phase3/config/index.php 2011-02-26 13:15:34 UTC (rev
82850)
@@ -0,0 +1 @@
+<?php require( dirname( dirname( __FILE__ ) ) . '/mw-config/index.php' );
\ No newline at end of file
Deleted: branches/REL1_17/phase3/config/index.php5
===================================================================
--- trunk/phase3/config/index.php5 2011-02-26 12:35:23 UTC (rev 82845)
+++ branches/REL1_17/phase3/config/index.php5 2011-02-26 13:15:34 UTC (rev
82850)
@@ -1 +0,0 @@
-<?php require( dirname( dirname( __FILE__ ) ) . '/mw-config/index.php5' );
\ No newline at end of file
Copied: branches/REL1_17/phase3/config/index.php5 (from rev 82845,
trunk/phase3/config/index.php5)
===================================================================
--- branches/REL1_17/phase3/config/index.php5 (rev 0)
+++ branches/REL1_17/phase3/config/index.php5 2011-02-26 13:15:34 UTC (rev
82850)
@@ -0,0 +1 @@
+<?php require( dirname( dirname( __FILE__ ) ) . '/mw-config/index.php5' );
\ No newline at end of file
Modified: branches/REL1_17/phase3/docs/distributors.txt
===================================================================
--- branches/REL1_17/phase3/docs/distributors.txt 2011-02-26 13:07:37 UTC
(rev 82849)
+++ branches/REL1_17/phase3/docs/distributors.txt 2011-02-26 13:15:34 UTC
(rev 82850)
@@ -61,7 +61,7 @@
* api.php, img_auth.php, index.php,opensearch_desc.php, profileinfo.php,
redirect.php, thumb.php, trackback.php. These are the entry points for
normal usage. This list may be incomplete and is subject to change.
- * config/index.php: Used for web-based installation (sets up the database,
+ * mw-config/index.php: Used for web-based installation (sets up the database,
prompts for the name of the wiki, etc.). No command-line installation is
currently available.
* images/: Used for uploaded files. This could be somewhere else if
@@ -83,13 +83,13 @@
== Configuration ==
MediaWiki is configured using LocalSettings.php. This is a PHP file that's
-generated when the user visits config/index.php to install the software, and
+generated when the user visits mw-config/index.php to install the software, and
which the user can edit by hand thereafter. It's just a plain old PHP file,
and can contain any PHP statements. It usually sets global variables that are
used for configuration, and includes files used by any extensions.
Distributors cannot easily add extra statements to the autogenerated
-LocalSettings.php at the present time -- although hacking config/index.php
+LocalSettings.php at the present time -- although hacking mw-config/index.php
would work. It would be nice if this situation could be improved.
Some configuration options that distributors might be in a position to set
Modified: branches/REL1_17/phase3/docs/scripts.txt
===================================================================
--- branches/REL1_17/phase3/docs/scripts.txt 2011-02-26 13:07:37 UTC (rev
82849)
+++ branches/REL1_17/phase3/docs/scripts.txt 2011-02-26 13:15:34 UTC (rev
82850)
@@ -61,5 +61,5 @@
the web server needs a .php5 to run the file with the PHP 5 engine and runs
.php
scripts with PHP 4. To use these files, you have to modify $wgScriptExtension
to
'.php5' is LocalSettings.php but it is already done by the config script if you
-used config/index.php5 for installation.
+used mw-config/index.php5 for installation.
Property changes on: branches/REL1_17/phase3/includes
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf-deployment/includes:53381
+ /branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:82845,82847-82848
Modified: branches/REL1_17/phase3/includes/WebStart.php
===================================================================
--- branches/REL1_17/phase3/includes/WebStart.php 2011-02-26 13:07:37 UTC
(rev 82849)
+++ branches/REL1_17/phase3/includes/WebStart.php 2011-02-26 13:15:34 UTC
(rev 82850)
@@ -107,8 +107,8 @@
define('MW_CONFIG_FILE', "$IP/LocalSettings.php");
# LocalSettings.php is the per site customization file. If it does not
exist
- # the wiki installer needs to be launched or the generated file moved
from
- # ./config/ to ./
+ # the wiki installer needs to be launched or the generated file
uploaded to
+ # the root wiki directory
if( !file_exists( MW_CONFIG_FILE ) ) {
require_once( "$IP/includes/templates/NoLocalSettings.php" );
die();
Modified: branches/REL1_17/phase3/includes/installer/Installer.php
===================================================================
--- branches/REL1_17/phase3/includes/installer/Installer.php 2011-02-26
13:07:37 UTC (rev 82849)
+++ branches/REL1_17/phase3/includes/installer/Installer.php 2011-02-26
13:15:34 UTC (rev 82850)
@@ -487,7 +487,7 @@
* On POSIX systems return the primary group of the webserver we're
running under.
* On other systems just returns null.
*
- * This is used to advice the user that he should chgrp his
config/data/images directory as the
+ * This is used to advice the user that he should chgrp his
mw-config/data/images directory as the
* webserver user before he can install.
*
* Public because SqliteInstaller needs it, and doesn't subclass
Installer.
@@ -838,7 +838,7 @@
return false;
}
- $uri = preg_replace( '{^(.*)/config.*$}', '$1', $path );
+ $uri = preg_replace( '{^(.*)/(mw-)?config.*$}', '$1', $path );
$this->setVar( 'wgScriptPath', $uri );
}
Modified: branches/REL1_17/phase3/includes/installer/WebInstaller.php
===================================================================
--- branches/REL1_17/phase3/includes/installer/WebInstaller.php 2011-02-26
13:07:37 UTC (rev 82849)
+++ branches/REL1_17/phase3/includes/installer/WebInstaller.php 2011-02-26
13:15:34 UTC (rev 82850)
@@ -298,7 +298,7 @@
/**
* Get a hash of data identifying this MW installation.
*
- * This is used by config/index.php to prevent multiple installations
of MW
+ * This is used by mw-config/index.php to prevent multiple
installations of MW
* on the same cookie domain from interfering with each other.
*/
public function getFingerprint() {
Modified: branches/REL1_17/phase3/includes/templates/NoLocalSettings.php
===================================================================
--- branches/REL1_17/phase3/includes/templates/NoLocalSettings.php
2011-02-26 13:07:37 UTC (rev 82849)
+++ branches/REL1_17/phase3/includes/templates/NoLocalSettings.php
2011-02-26 13:15:34 UTC (rev 82850)
@@ -52,9 +52,9 @@
<p>
<?php
if ( $installerStarted ) {
- echo( "Please <a href=\"" . htmlspecialchars( $path ) .
"config/index." . htmlspecialchars( $ext ) . "\"> complete the installation</a>
and download LocalSettings.php." );
+ echo( "Please <a href=\"" . htmlspecialchars( $path ) .
"mw-config/index." . htmlspecialchars( $ext ) . "\"> complete the
installation</a> and download LocalSettings.php." );
} else {
- echo( "Please <a href=\"" . htmlspecialchars( $path ) .
"config/index." . htmlspecialchars( $ext ) . "\"> set up the wiki</a> first." );
+ echo( "Please <a href=\"" . htmlspecialchars( $path ) .
"mw-config/index." . htmlspecialchars( $ext ) . "\"> set up the wiki</a>
first." );
}
?>
</p>
Modified: branches/REL1_17/phase3/includes/templates/PHP4.php
===================================================================
--- branches/REL1_17/phase3/includes/templates/PHP4.php 2011-02-26 13:07:37 UTC
(rev 82849)
+++ branches/REL1_17/phase3/includes/templates/PHP4.php 2011-02-26 13:15:34 UTC
(rev 82850)
@@ -19,7 +19,7 @@
} else {
$scriptUrl = '';
}
-if ( preg_match( '!^(.*)/config/[^/]*.php$!', $scriptUrl, $m ) ) {
+if ( preg_match( '!^(.*)/(mw-)?config/[^/]*.php$!', $scriptUrl, $m ) ) {
$baseUrl = $m[1];
} elseif ( preg_match( '!^(.*)/[^/]*.php$!', $scriptUrl, $m ) ) {
$baseUrl = $m[1];
Property changes on: branches/REL1_17/phase3/mw-config
___________________________________________________________________
Added: svn:ignore
+ LocalSettings.php
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
