http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89624
Revision: 89624
Author: tstarling
Date: 2011-06-07 05:11:50 +0000 (Tue, 07 Jun 2011)
Log Message:
-----------
* Restored the page shown when LocalSettings.php is missing to how it was
before r85918. That template is a welcome page, not a "catastrophic error".
* Fixed attempted remote loading of the logo image in index.php's wfDie(). Use
the distributed mediawiki.png instead, that's what it's there for.
Modified Paths:
--------------
trunk/phase3/includes/WebStart.php
trunk/phase3/index.php
Added Paths:
-----------
trunk/phase3/includes/templates/NoLocalSettings.php
Modified: trunk/phase3/includes/WebStart.php
===================================================================
--- trunk/phase3/includes/WebStart.php 2011-06-07 05:09:32 UTC (rev 89623)
+++ trunk/phase3/includes/WebStart.php 2011-06-07 05:11:50 UTC (rev 89624)
@@ -111,26 +111,8 @@
# the wiki installer needs to be launched or the generated file
uploaded to
# the root wiki directory
if( !file_exists( MW_CONFIG_FILE ) ) {
- $script = $_SERVER['SCRIPT_NAME'];
- $path = htmlspecialchars( str_replace( '//', '/', pathinfo(
$script, PATHINFO_DIRNAME ) ) );
- $ext = htmlspecialchars( pathinfo( $script, PATHINFO_EXTENSION
) );
-
- # Check to see if the installer is running
- if ( !function_exists( 'session_name' ) ) {
- $installerStarted = false;
- } else {
- session_name( 'mw_installer_session' );
- $oldReporting = error_reporting( E_ALL & ~E_NOTICE );
- $success = session_start();
- error_reporting( $oldReporting );
- $installerStarted = ( $success && isset(
$_SESSION['installData'] ) );
- }
-
- $please = $installerStarted
- ? "Please <a href=\"$path/mw-config/index.$ext\">
complete the installation</a> and download LocalSettings.php."
- : "Please <a href=\"$path/mw-config/index.$ext\"> set
up the wiki</a> first.";
-
- wfDie( "<p>LocalSettings.php not found.</p><p>$please</p>" );
+ require_once( "$IP/includes/templates/NoLocalSettings.php" );
+ die();
}
# Include site settings. $IP may be changed (hopefully before the
AutoLoader is invoked)
Copied: trunk/phase3/includes/templates/NoLocalSettings.php (from rev 85917,
trunk/phase3/includes/templates/NoLocalSettings.php)
===================================================================
--- trunk/phase3/includes/templates/NoLocalSettings.php
(rev 0)
+++ trunk/phase3/includes/templates/NoLocalSettings.php 2011-06-07 05:11:50 UTC
(rev 89624)
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Template used when there is no LocalSettings.php file
+ *
+ * @file
+ * @ingroup Templates
+ */
+
+if ( !isset( $wgVersion ) ) {
+ $wgVersion = 'VERSION';
+}
+$script = $_SERVER['SCRIPT_NAME'];
+$path = pathinfo( $script, PATHINFO_DIRNAME ) . '/';
+$path = str_replace( '//', '/', $path );
+$ext = pathinfo( $script, PATHINFO_EXTENSION );
+
+# Check to see if the installer is running
+if ( !function_exists( 'session_name' ) ) {
+ $installerStarted = false;
+} else {
+ session_name( 'mw_installer_session' );
+ $oldReporting = error_reporting( E_ALL & ~E_NOTICE );
+ $success = session_start();
+ error_reporting( $oldReporting );
+ $installerStarted = ( $success && isset( $_SESSION['installData'] ) );
+}
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html xmlns='http://www.w3.org/1999/xhtml' lang='en'>
+ <head>
+ <title>MediaWiki <?php echo htmlspecialchars( $wgVersion )
?></title>
+ <meta http-equiv='Content-Type' content='text/html;
charset=utf-8' />
+ <style type='text/css' media='screen'>
+ html, body {
+ color: #000;
+ background-color: #fff;
+ font-family: sans-serif;
+ text-align: center;
+ }
+
+ h1 {
+ font-size: 150%;
+ }
+ </style>
+ </head>
+ <body>
+ <img src="<?php echo htmlspecialchars( $path )
?>skins/common/images/mediawiki.png" alt='The MediaWiki logo' />
+
+ <h1>MediaWiki <?php echo htmlspecialchars( $wgVersion ) ?></h1>
+ <div class='error'>
+ <p>LocalSettings.php not found.</p>
+ <p>
+ <?php
+ if ( $installerStarted ) {
+ 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 ) .
"mw-config/index." . htmlspecialchars( $ext ) . "\"> set up the wiki</a>
first." );
+ }
+ ?>
+ </p>
+
+ </div>
+ </body>
+</html>
Property changes on: trunk/phase3/includes/templates/NoLocalSettings.php
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/includes/templates/NoLocalSettings.php:51646
/branches/new-installer/phase3/includes/templates/NoLocalSettings.php:43664-66004
/branches/sqlite/includes/templates/NoLocalSettings.php:58211-58321
/branches/wmf-deployment/includes/templates/NoLocalSettings.php:53381
Added: svn:eol-style
+ native
Modified: trunk/phase3/index.php
===================================================================
--- trunk/phase3/index.php 2011-06-07 05:09:32 UTC (rev 89623)
+++ trunk/phase3/index.php 2011-06-07 05:11:50 UTC (rev 89624)
@@ -180,9 +180,15 @@
$version = isset( $wgVersion ) && $wgVersion
? htmlspecialchars( $wgVersion )
: '';
+
+ $script = $_SERVER['SCRIPT_NAME'];
+ $path = pathinfo( $script, PATHINFO_DIRNAME ) . '/';
+ $path = str_replace( '//', '/', $path );
+
$logo = isset( $wgLogo ) && $wgLogo
? $wgLogo
- :
'http://upload.wikimedia.org/wikipedia/commons/1/1c/MediaWiki_logo.png';
+ : $path . 'skins/common/images/mediawiki.png';
+ $encLogo = htmlspecialchars( $logo );
header( $_SERVER['SERVER_PROTOCOL'] . ' 500 MediaWiki configuration
Error', true, 500 );
header( 'Content-type: text/html; charset=UTF-8' );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
