| Index: branches/REL1_17/phase3/docs/scripts.txt |
| — | — | @@ -61,5 +61,5 @@ |
| 62 | 62 | the web server needs a .php5 to run the file with the PHP 5 engine and runs .php |
| 63 | 63 | scripts with PHP 4. To use these files, you have to modify $wgScriptExtension to |
| 64 | 64 | '.php5' is LocalSettings.php but it is already done by the config script if you |
| 65 | | -used config/index.php5 for installation. |
| | 65 | +used mw-config/index.php5 for installation. |
| 66 | 66 | |
| Index: branches/REL1_17/phase3/docs/distributors.txt |
| — | — | @@ -61,7 +61,7 @@ |
| 62 | 62 | * api.php, img_auth.php, index.php,opensearch_desc.php, profileinfo.php, |
| 63 | 63 | redirect.php, thumb.php, trackback.php. These are the entry points for |
| 64 | 64 | normal usage. This list may be incomplete and is subject to change. |
| 65 | | - * config/index.php: Used for web-based installation (sets up the database, |
| | 65 | + * mw-config/index.php: Used for web-based installation (sets up the database, |
| 66 | 66 | prompts for the name of the wiki, etc.). No command-line installation is |
| 67 | 67 | currently available. |
| 68 | 68 | * images/: Used for uploaded files. This could be somewhere else if |
| — | — | @@ -83,13 +83,13 @@ |
| 84 | 84 | == Configuration == |
| 85 | 85 | |
| 86 | 86 | MediaWiki is configured using LocalSettings.php. This is a PHP file that's |
| 87 | | -generated when the user visits config/index.php to install the software, and |
| | 87 | +generated when the user visits mw-config/index.php to install the software, and |
| 88 | 88 | which the user can edit by hand thereafter. It's just a plain old PHP file, |
| 89 | 89 | and can contain any PHP statements. It usually sets global variables that are |
| 90 | 90 | used for configuration, and includes files used by any extensions. |
| 91 | 91 | |
| 92 | 92 | Distributors cannot easily add extra statements to the autogenerated |
| 93 | | -LocalSettings.php at the present time -- although hacking config/index.php |
| | 93 | +LocalSettings.php at the present time -- although hacking mw-config/index.php |
| 94 | 94 | would work. It would be nice if this situation could be improved. |
| 95 | 95 | |
| 96 | 96 | Some configuration options that distributors might be in a position to set |
| Index: branches/REL1_17/phase3/includes/installer/WebInstaller.php |
| — | — | @@ -298,7 +298,7 @@ |
| 299 | 299 | /** |
| 300 | 300 | * Get a hash of data identifying this MW installation. |
| 301 | 301 | * |
| 302 | | - * This is used by config/index.php to prevent multiple installations of MW |
| | 302 | + * This is used by mw-config/index.php to prevent multiple installations of MW |
| 303 | 303 | * on the same cookie domain from interfering with each other. |
| 304 | 304 | */ |
| 305 | 305 | public function getFingerprint() { |
| Index: branches/REL1_17/phase3/includes/installer/Installer.php |
| — | — | @@ -487,7 +487,7 @@ |
| 488 | 488 | * On POSIX systems return the primary group of the webserver we're running under. |
| 489 | 489 | * On other systems just returns null. |
| 490 | 490 | * |
| 491 | | - * This is used to advice the user that he should chgrp his config/data/images directory as the |
| | 491 | + * This is used to advice the user that he should chgrp his mw-config/data/images directory as the |
| 492 | 492 | * webserver user before he can install. |
| 493 | 493 | * |
| 494 | 494 | * Public because SqliteInstaller needs it, and doesn't subclass Installer. |
| — | — | @@ -838,7 +838,7 @@ |
| 839 | 839 | return false; |
| 840 | 840 | } |
| 841 | 841 | |
| 842 | | - $uri = preg_replace( '{^(.*)/config.*$}', '$1', $path ); |
| | 842 | + $uri = preg_replace( '{^(.*)/(mw-)?config.*$}', '$1', $path ); |
| 843 | 843 | $this->setVar( 'wgScriptPath', $uri ); |
| 844 | 844 | } |
| 845 | 845 | |
| Index: branches/REL1_17/phase3/includes/WebStart.php |
| — | — | @@ -107,8 +107,8 @@ |
| 108 | 108 | define('MW_CONFIG_FILE', "$IP/LocalSettings.php"); |
| 109 | 109 | |
| 110 | 110 | # LocalSettings.php is the per site customization file. If it does not exist |
| 111 | | - # the wiki installer needs to be launched or the generated file moved from |
| 112 | | - # ./config/ to ./ |
| | 111 | + # the wiki installer needs to be launched or the generated file uploaded to |
| | 112 | + # the root wiki directory |
| 113 | 113 | if( !file_exists( MW_CONFIG_FILE ) ) { |
| 114 | 114 | require_once( "$IP/includes/templates/NoLocalSettings.php" ); |
| 115 | 115 | die(); |
| Index: branches/REL1_17/phase3/includes/templates/PHP4.php |
| — | — | @@ -19,7 +19,7 @@ |
| 20 | 20 | } else { |
| 21 | 21 | $scriptUrl = ''; |
| 22 | 22 | } |
| 23 | | -if ( preg_match( '!^(.*)/config/[^/]*.php$!', $scriptUrl, $m ) ) { |
| | 23 | +if ( preg_match( '!^(.*)/(mw-)?config/[^/]*.php$!', $scriptUrl, $m ) ) { |
| 24 | 24 | $baseUrl = $m[1]; |
| 25 | 25 | } elseif ( preg_match( '!^(.*)/[^/]*.php$!', $scriptUrl, $m ) ) { |
| 26 | 26 | $baseUrl = $m[1]; |
| Index: branches/REL1_17/phase3/includes/templates/NoLocalSettings.php |
| — | — | @@ -52,9 +52,9 @@ |
| 53 | 53 | <p> |
| 54 | 54 | <?php |
| 55 | 55 | if ( $installerStarted ) { |
| 56 | | - echo( "Please <a href=\"" . htmlspecialchars( $path ) . "config/index." . htmlspecialchars( $ext ) . "\"> complete the installation</a> and download LocalSettings.php." ); |
| | 56 | + echo( "Please <a href=\"" . htmlspecialchars( $path ) . "mw-config/index." . htmlspecialchars( $ext ) . "\"> complete the installation</a> and download LocalSettings.php." ); |
| 57 | 57 | } else { |
| 58 | | - echo( "Please <a href=\"" . htmlspecialchars( $path ) . "config/index." . htmlspecialchars( $ext ) . "\"> set up the wiki</a> first." ); |
| | 58 | + echo( "Please <a href=\"" . htmlspecialchars( $path ) . "mw-config/index." . htmlspecialchars( $ext ) . "\"> set up the wiki</a> first." ); |
| 59 | 59 | } |
| 60 | 60 | ?> |
| 61 | 61 | </p> |
| Property changes on: branches/REL1_17/phase3/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 62 | 62 | Merged /trunk/phase3/includes:r82845,82847-82848 |
| Index: branches/REL1_17/phase3/INSTALL |
| — | — | @@ -65,7 +65,7 @@ |
| 66 | 66 | way (yet) to get it after you exit the installer. Place it in the main wiki |
| 67 | 67 | directory, and the wiki should now be working. |
| 68 | 68 | |
| 69 | | -Once the wiki is set up, you should remove the config directory (though it will |
| | 69 | +Once the wiki is set up, you should remove the mw-config directory (though it will |
| 70 | 70 | refuse to config again if the wiki is set up). |
| 71 | 71 | |
| 72 | 72 | ---- |
| Index: branches/REL1_17/phase3/mw-config/index.php5 |
| — | — | @@ -0,0 +1,4 @@ |
| | 2 | +<?php |
| | 3 | + |
| | 4 | +define('MW_INSTALL_PHP5_EXT', 1); |
| | 5 | +require './index.php'; |
| Property changes on: branches/REL1_17/phase3/mw-config/index.php5 |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 6 | + native |
| Index: branches/REL1_17/phase3/mw-config/index.php |
| — | — | @@ -0,0 +1,50 @@ |
| | 2 | +<?php |
| | 3 | +/** |
| | 4 | + * New version of MediaWiki web-based config/installation |
| | 5 | + * |
| | 6 | + * @file |
| | 7 | + */ |
| | 8 | + |
| | 9 | +define( 'MW_CONFIG_CALLBACK', 'Installer::overrideConfig' ); |
| | 10 | +define( 'MEDIAWIKI_INSTALL', true ); |
| | 11 | + |
| | 12 | +chdir( dirname( dirname( __FILE__ ) ) ); |
| | 13 | +require( dirname( dirname( __FILE__ ) ) . '/includes/WebStart.php' ); |
| | 14 | + |
| | 15 | +wfInstallerMain(); |
| | 16 | + |
| | 17 | +function wfInstallerMain() { |
| | 18 | + global $wgRequest, $wgLang, $wgMetaNamespace, $wgCanonicalNamespaceNames; |
| | 19 | + |
| | 20 | + $installer = new WebInstaller( $wgRequest ); |
| | 21 | + |
| | 22 | + if ( !$installer->startSession() ) { |
| | 23 | + $installer->finish(); |
| | 24 | + exit; |
| | 25 | + } |
| | 26 | + |
| | 27 | + $fingerprint = $installer->getFingerprint(); |
| | 28 | + if ( isset( $_SESSION['installData'][$fingerprint] ) ) { |
| | 29 | + $session = $_SESSION['installData'][$fingerprint]; |
| | 30 | + } else { |
| | 31 | + $session = array(); |
| | 32 | + } |
| | 33 | + |
| | 34 | + if ( isset( $session['settings']['_UserLang'] ) ) { |
| | 35 | + $langCode = $session['settings']['_UserLang']; |
| | 36 | + } elseif ( !is_null( $wgRequest->getVal( 'UserLang' ) ) ) { |
| | 37 | + $langCode = $wgRequest->getVal( 'UserLang' ); |
| | 38 | + } else { |
| | 39 | + $langCode = 'en'; |
| | 40 | + } |
| | 41 | + $wgLang = Language::factory( $langCode ); |
| | 42 | + |
| | 43 | + $installer->setParserLanguage( $wgLang ); |
| | 44 | + |
| | 45 | + $wgMetaNamespace = $wgCanonicalNamespaceNames[NS_PROJECT]; |
| | 46 | + |
| | 47 | + $session = $installer->execute( $session ); |
| | 48 | + |
| | 49 | + $_SESSION['installData'][$fingerprint] = $session; |
| | 50 | + |
| | 51 | +} |
| Property changes on: branches/REL1_17/phase3/mw-config/index.php |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 52 | + native |
| Property changes on: branches/REL1_17/phase3/mw-config |
| ___________________________________________________________________ |
| Added: svn:ignore |
| 2 | 53 | + LocalSettings.php |
| Index: branches/REL1_17/phase3/config/index.php5 |
| — | — | @@ -1,4 +1 @@ |
| 2 | | -<?php |
| 3 | | - |
| 4 | | -define('MW_INSTALL_PHP5_EXT', 1); |
| 5 | | -require './index.php'; |
| | 2 | +<?php require( dirname( dirname( __FILE__ ) ) . '/mw-config/index.php5' ); |
| \ No newline at end of file |
| Property changes on: branches/REL1_17/phase3/config/index.php5 |
| ___________________________________________________________________ |
| Deleted: svn:eol-style |
| 6 | 3 | - native |
| Index: branches/REL1_17/phase3/config/OBSOLETE |
| — | — | @@ -0,0 +1,2 @@ |
| | 2 | +This is a back-compat directory for installer, which resides in mw-config/ now.
|
| | 3 | +It will probably be remved in 1.19. |
| \ No newline at end of file |
| Index: branches/REL1_17/phase3/config/index.php |
| — | — | @@ -1,50 +1 @@ |
| 2 | | -<?php |
| 3 | | -/** |
| 4 | | - * New version of MediaWiki web-based config/installation |
| 5 | | - * |
| 6 | | - * @file |
| 7 | | - */ |
| 8 | | - |
| 9 | | -define( 'MW_CONFIG_CALLBACK', 'Installer::overrideConfig' ); |
| 10 | | -define( 'MEDIAWIKI_INSTALL', true ); |
| 11 | | - |
| 12 | | -chdir( ".." ); |
| 13 | | -require( './includes/WebStart.php' ); |
| 14 | | - |
| 15 | | -wfInstallerMain(); |
| 16 | | - |
| 17 | | -function wfInstallerMain() { |
| 18 | | - global $wgRequest, $wgLang, $wgMetaNamespace, $wgCanonicalNamespaceNames; |
| 19 | | - |
| 20 | | - $installer = new WebInstaller( $wgRequest ); |
| 21 | | - |
| 22 | | - if ( !$installer->startSession() ) { |
| 23 | | - $installer->finish(); |
| 24 | | - exit; |
| 25 | | - } |
| 26 | | - |
| 27 | | - $fingerprint = $installer->getFingerprint(); |
| 28 | | - if ( isset( $_SESSION['installData'][$fingerprint] ) ) { |
| 29 | | - $session = $_SESSION['installData'][$fingerprint]; |
| 30 | | - } else { |
| 31 | | - $session = array(); |
| 32 | | - } |
| 33 | | - |
| 34 | | - if ( isset( $session['settings']['_UserLang'] ) ) { |
| 35 | | - $langCode = $session['settings']['_UserLang']; |
| 36 | | - } elseif ( !is_null( $wgRequest->getVal( 'UserLang' ) ) ) { |
| 37 | | - $langCode = $wgRequest->getVal( 'UserLang' ); |
| 38 | | - } else { |
| 39 | | - $langCode = 'en'; |
| 40 | | - } |
| 41 | | - $wgLang = Language::factory( $langCode ); |
| 42 | | - |
| 43 | | - $installer->setParserLanguage( $wgLang ); |
| 44 | | - |
| 45 | | - $wgMetaNamespace = $wgCanonicalNamespaceNames[NS_PROJECT]; |
| 46 | | - |
| 47 | | - $session = $installer->execute( $session ); |
| 48 | | - |
| 49 | | - $_SESSION['installData'][$fingerprint] = $session; |
| 50 | | - |
| 51 | | -} |
| | 2 | +<?php require( dirname( dirname( __FILE__ ) ) . '/mw-config/index.php' ); |
| \ No newline at end of file |
| Property changes on: branches/REL1_17/phase3/config |
| ___________________________________________________________________ |
| Deleted: svn:ignore |
| 52 | 3 | - LocalSettings.php |
| Index: branches/REL1_17/phase3/RELEASE-NOTES |
| — | — | @@ -22,7 +22,9 @@ |
| 23 | 23 | MediaWiki 1.17 is shipping with a completely redesigned installer to fix |
| 24 | 24 | a lot of outstanding bugs, cleanup the code quality, and make it easier to |
| 25 | 25 | use. Notably, you can now run upgrades from the web without having to move |
| 26 | | -LocalSettings.php. The specific bugs are listed below in the general notes. |
| | 26 | +LocalSettings.php. Also, configuration script directory has been renamed |
| | 27 | +from config/ to mw-config/. The specific bugs are listed below in the |
| | 28 | +general notes. |
| 27 | 29 | |
| 28 | 30 | === New ResourceLoader in 1.17 === |
| 29 | 31 | MediaWiki 1.17 ships with a ResourceLoader which combines and minifies css and |
| — | — | @@ -493,6 +495,7 @@ |
| 494 | 496 | * (bug 26208) Mark directionality of some interlanguage links |
| 495 | 497 | * (bug 26716) Provide link to instructions for external editor related preferences. |
| 496 | 498 | * (bug 26961) Hide anon edits in watchlist preference now actually works. |
| | 499 | +* (bug 1379) Installer directory conflicts with some hosts' configuration panel. |
| 497 | 500 | |
| 498 | 501 | === API changes in 1.17 === |
| 499 | 502 | * BREAKING CHANGE: action=patrol now requires POST |
| Property changes on: branches/REL1_17/phase3/RELEASE-NOTES |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 500 | 503 | Merged /trunk/phase3/RELEASE-NOTES:r82845,82847-82848 |
| Property changes on: branches/REL1_17/phase3 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 501 | 504 | Merged /trunk/phase3:r82845,82847-82849 |