dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4922a1c)
* Restored the page shown when LocalSettings.php is missing to how it was before...
authorTim Starling <tstarling@users.mediawiki.org>
Tue, 7 Jun 2011 05:11:50 +0000 (05:11 +0000)
committerTim Starling <tstarling@users.mediawiki.org>
Tue, 7 Jun 2011 05:11:50 +0000 (05:11 +0000)
* 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.

includes/WebStart.php patch | blob | history
includes/templates/NoLocalSettings.php [new file with mode: 0644] patch | blob
index.php patch | blob | history

diff --git a/includes/WebStart.php b/includes/WebStart.php
index 6ace96c..5e3b42d 100644 (file)
--- a/includes/WebStart.php
+++ b/includes/WebStart.php
@@ -111,26 +111,8 @@ if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
        # 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)
diff --git a/includes/templates/NoLocalSettings.php b/includes/templates/NoLocalSettings.php
new file mode 100644 (file)
index 0000000..9001e3b
--- /dev/null
+++ b/includes/templates/NoLocalSettings.php
@@ -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>
diff --git a/index.php b/index.php
index c7d0f92..36c9974 100644 (file)
--- a/index.php
+++ b/index.php
@@ -180,9 +180,15 @@ function wfDie( $errorMsg ){
        $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' );
Wiklou, le Wiki du Wiklou