| Index: trunk/phase3/includes/installer/WebInstaller.php |
| — | — | @@ -121,7 +121,7 @@ |
| 122 | 122 | if( ( $this->getVar( '_InstallDone' ) || $this->getVar( '_UpgradeDone' ) ) |
| 123 | 123 | && $this->request->getVal( 'localsettings' ) ) |
| 124 | 124 | { |
| 125 | | - $this->request->response()->header( 'Content-type: text/plain' ); |
| | 125 | + $this->request->response()->header( 'Content-type: application/x-httpd-php' ); |
| 126 | 126 | $this->request->response()->header( |
| 127 | 127 | 'Content-Disposition: attachment; filename="LocalSettings.php"' |
| 128 | 128 | ); |
| Index: trunk/phase3/includes/installer/WebInstallerPage.php |
| — | — | @@ -940,11 +940,16 @@ |
| 941 | 941 | class WebInstaller_Complete extends WebInstallerPage { |
| 942 | 942 | |
| 943 | 943 | public function execute() { |
| | 944 | + // Pop up a dialog box, to make it difficult for the user to forget |
| | 945 | + // to download the file |
| | 946 | + $lsUrl = $GLOBALS['wgServer'] . $this->parent->getURL( array( 'localsettings' => 1 ) ); |
| | 947 | + $this->parent->request->response()->header( "Refresh: 0;$lsUrl" ); |
| | 948 | + |
| 944 | 949 | $this->startForm(); |
| 945 | 950 | $this->addHTML( |
| 946 | 951 | $this->parent->getInfoBox( |
| 947 | 952 | wfMsgNoTrans( 'config-install-done', |
| 948 | | - $GLOBALS['wgServer'] . $this->parent->getURL( array( 'localsettings' => 1 ) ), |
| | 953 | + $lsUrl, |
| 949 | 954 | $GLOBALS['wgServer'] . |
| 950 | 955 | $this->getVar( 'wgScriptPath' ) . '/index' . |
| 951 | 956 | $this->getVar( 'wgScriptExtension' ) |