| Index: trunk/phase3/includes/installer/CoreInstaller.php |
| — | — | @@ -494,6 +494,9 @@ |
| 495 | 495 | // Allow multiple ob_flush() calls |
| 496 | 496 | $GLOBALS['wgDisableOutputCompression'] = true; |
| 497 | 497 | |
| | 498 | + // Use a sensible cookie prefix (not my_wiki) |
| | 499 | + $GLOBALS['wgCookiePrefix'] = 'mw_installer'; |
| | 500 | + |
| 498 | 501 | // Some of the environment checks make shell requests, remove limits |
| 499 | 502 | $GLOBALS['wgMaxShellMemory'] = 0; |
| 500 | 503 | } |
| Index: trunk/phase3/includes/templates/NoLocalSettings.php |
| — | — | @@ -13,6 +13,17 @@ |
| 14 | 14 | $path = pathinfo( $script, PATHINFO_DIRNAME ) . '/'; |
| 15 | 15 | $path = str_replace( '//', '/', $path ); |
| 16 | 16 | $ext = pathinfo( $script, PATHINFO_EXTENSION ); |
| | 17 | + |
| | 18 | +# Check to see if the installer is running |
| | 19 | +if ( !function_exists( 'session_name' ) ) { |
| | 20 | + $installerStarted = false; |
| | 21 | +} else { |
| | 22 | + session_name( 'mw_installer_session' ); |
| | 23 | + $oldReporting = error_reporting( E_ALL & ~E_NOTICE ); |
| | 24 | + $success = session_start(); |
| | 25 | + error_reporting( $oldReporting ); |
| | 26 | + $installerStarted = ( $success && isset( $_SESSION['installData'] ) ); |
| | 27 | +} |
| 17 | 28 | ?> |
| 18 | 29 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> |
| 19 | 30 | <html xmlns='http://www.w3.org/1999/xhtml' lang='en'> |
| — | — | @@ -37,13 +48,16 @@ |
| 38 | 49 | |
| 39 | 50 | <h1>MediaWiki <?php echo htmlspecialchars( $wgVersion ) ?></h1> |
| 40 | 51 | <div class='error'> |
| | 52 | + <p>LocalSettings.php not found.</p> |
| | 53 | + <p> |
| 41 | 54 | <?php |
| 42 | | - if ( file_exists( 'config/LocalSettings.php' ) ) { |
| 43 | | - echo( 'To complete the installation, move <tt>config/LocalSettings.php</tt> to the parent directory.' ); |
| | 55 | + if ( $installerStarted ) { |
| | 56 | + echo( "Please <a href=\"" . htmlspecialchars( $path ) . "config/index." . htmlspecialchars( $ext ) . "\"> complete the installation</a> and download LocalSettings.php." ); |
| 44 | 57 | } else { |
| 45 | | - echo( "Please <a href=\"" . htmlspecialchars( $path ) . "config/index." . htmlspecialchars( $ext ) . "\" title='setup'> set up the wiki</a> first." ); |
| | 58 | + echo( "Please <a href=\"" . htmlspecialchars( $path ) . "config/index." . htmlspecialchars( $ext ) . "\"> set up the wiki</a> first." ); |
| 46 | 59 | } |
| 47 | 60 | ?> |
| | 61 | + </p> |
| 48 | 62 | |
| 49 | 63 | </div> |
| 50 | 64 | </body> |