http://www.mediawiki.org/wiki/Special:Code/MediaWiki/82845
Revision: 82845
Author: maxsem
Date: 2011-02-26 12:35:23 +0000 (Sat, 26 Feb 2011)
Log Message:
-----------
(bug 1379) Installer directory conflicts with some hosts' configuration panel.
Renamed config/ to mw-config/, however left aliases for b/c.
Modified Paths:
--------------
trunk/phase3/HISTORY
trunk/phase3/INSTALL
trunk/phase3/docs/distributors.txt
trunk/phase3/docs/scripts.txt
trunk/phase3/includes/WebStart.php
trunk/phase3/includes/installer/Installer.php
trunk/phase3/includes/installer/WebInstaller.php
trunk/phase3/includes/templates/NoLocalSettings.php
trunk/phase3/includes/templates/PHP4.php
Added Paths:
-----------
trunk/phase3/config/
trunk/phase3/config/OBSOLETE
trunk/phase3/config/index.php
trunk/phase3/config/index.php5
trunk/phase3/mw-config/
Removed Paths:
-------------
trunk/phase3/config/
Modified: trunk/phase3/HISTORY
===================================================================
--- trunk/phase3/HISTORY 2011-02-26 12:19:55 UTC (rev 82844)
+++ trunk/phase3/HISTORY 2011-02-26 12:35:23 UTC (rev 82845)
@@ -451,6 +451,7 @@
* (bug 18372) $wgFileExtensions will now override $wgFileBlacklist
* (bug 25512) Subcategory list should not include category prefix for members.
* (bug 20244) Installer does not validate SQLite database directory for stable
path
+* (bug 1379) Installer directory conflicts with some hosts' configuration
panel.
=== API changes in 1.17 ===
* (bug 22738) Allow filtering by action type on query=logevent.
Modified: trunk/phase3/INSTALL
===================================================================
--- trunk/phase3/INSTALL 2011-02-26 12:19:55 UTC (rev 82844)
+++ trunk/phase3/INSTALL 2011-02-26 12:35:23 UTC (rev 82845)
@@ -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).
----
Added: trunk/phase3/config/OBSOLETE
===================================================================
--- trunk/phase3/config/OBSOLETE (rev 0)
+++ trunk/phase3/config/OBSOLETE 2011-02-26 12:35:23 UTC (rev 82845)
@@ -0,0 +1,2 @@
+This is a back-compat directory for installer, which resides in mw-config/ now.
+It will probably be remved in 1.19.
\ No newline at end of file
Added: trunk/phase3/config/index.php
===================================================================
--- trunk/phase3/config/index.php (rev 0)
+++ trunk/phase3/config/index.php 2011-02-26 12:35:23 UTC (rev 82845)
@@ -0,0 +1 @@
+<?php require( dirname( dirname( __FILE__ ) ) . '/mw-config/index.php' );
\ No newline at end of file
Property changes on: trunk/phase3/config/index.php
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/phase3/config/index.php5
===================================================================
--- trunk/phase3/config/index.php5 (rev 0)
+++ trunk/phase3/config/index.php5 2011-02-26 12:35:23 UTC (rev 82845)
@@ -0,0 +1 @@
+<?php require( dirname( dirname( __FILE__ ) ) . '/mw-config/index.php5' );
\ No newline at end of file
Modified: trunk/phase3/docs/distributors.txt
===================================================================
--- trunk/phase3/docs/distributors.txt 2011-02-26 12:19:55 UTC (rev 82844)
+++ trunk/phase3/docs/distributors.txt 2011-02-26 12:35:23 UTC (rev 82845)
@@ -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: trunk/phase3/docs/scripts.txt
===================================================================
--- trunk/phase3/docs/scripts.txt 2011-02-26 12:19:55 UTC (rev 82844)
+++ trunk/phase3/docs/scripts.txt 2011-02-26 12:35:23 UTC (rev 82845)
@@ -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.
Modified: trunk/phase3/includes/WebStart.php
===================================================================
--- trunk/phase3/includes/WebStart.php 2011-02-26 12:19:55 UTC (rev 82844)
+++ trunk/phase3/includes/WebStart.php 2011-02-26 12:35:23 UTC (rev 82845)
@@ -104,7 +104,7 @@
# 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 ./
+ # ./mw-config/ to ./
if( !file_exists( MW_CONFIG_FILE ) ) {
require_once( "$IP/includes/templates/NoLocalSettings.php" );
die();
Modified: trunk/phase3/includes/installer/Installer.php
===================================================================
--- trunk/phase3/includes/installer/Installer.php 2011-02-26 12:19:55 UTC
(rev 82844)
+++ trunk/phase3/includes/installer/Installer.php 2011-02-26 12:35:23 UTC
(rev 82845)
@@ -485,7 +485,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.
Modified: trunk/phase3/includes/installer/WebInstaller.php
===================================================================
--- trunk/phase3/includes/installer/WebInstaller.php 2011-02-26 12:19:55 UTC
(rev 82844)
+++ trunk/phase3/includes/installer/WebInstaller.php 2011-02-26 12:35:23 UTC
(rev 82845)
@@ -316,7 +316,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: trunk/phase3/includes/templates/NoLocalSettings.php
===================================================================
--- trunk/phase3/includes/templates/NoLocalSettings.php 2011-02-26 12:19:55 UTC
(rev 82844)
+++ trunk/phase3/includes/templates/NoLocalSettings.php 2011-02-26 12:35:23 UTC
(rev 82845)
@@ -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: trunk/phase3/includes/templates/PHP4.php
===================================================================
--- trunk/phase3/includes/templates/PHP4.php 2011-02-26 12:19:55 UTC (rev
82844)
+++ trunk/phase3/includes/templates/PHP4.php 2011-02-26 12:35:23 UTC (rev
82845)
@@ -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];
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
