X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=install.php;h=dec2020f5e70136cb7be1f738e6dae0b5bfe503a;hb=28f7f0a1ed90250a6a8205159f4e68a26c96d9f2;hp=1e8b31c3346dfb76de6b740c5d56c486ae304567;hpb=1dea93f758375b209c402d01543a10f75d597f30;p=lhc%2Fweb%2Fwiklou.git

diff --git a/install.php b/install.php
index 1e8b31c334..dec2020f5e 100644
--- a/install.php
+++ b/install.php
@@ -1,5 +1,7 @@
 <?php
 
+die("obsolete; remove this file befor 1.3.0 release\n");
+
 # Install software and create new empty database.
 #
 
@@ -15,9 +17,13 @@ if ( ! ( is_readable( "./LocalSettings.php" )
 }
 
 $DP = "./includes";
-include_once( "./LocalSettings.php" );
-include_once( "./AdminSettings.php" );
-include_once( "./maintenance/InitialiseMessages.inc" );
+require_once( "./LocalSettings.php" );
+require_once( "./AdminSettings.php" );
+require_once( "./maintenance/InitialiseMessages.inc" );
+
+if( $wgSitename == "MediaWiki" ) {
+	die( "You must set the site name in \$wgSitename before installation.\n\n" );
+}
 
 if ( $wgUseTeX && ( ! is_executable( "./math/texvc" ) ) ) {
 	print "To use math functions, you must first compile texvc by\n" .
@@ -60,18 +66,23 @@ copydirectory( "./includes", $IP );
 copydirectory( "./stylesheets", $wgStyleSheetDirectory );
 
 copyfile( "./images", "wiki.png", $wgUploadDirectory );
-copyfile( "./images", "button_bold.gif", $wgUploadDirectory );
-copyfile( "./images", "button_extlink.gif", $wgUploadDirectory );
-copyfile( "./images", "button_headline.gif", $wgUploadDirectory );
-copyfile( "./images", "button_hr.gif", $wgUploadDirectory );
-copyfile( "./images", "button_image.gif", $wgUploadDirectory );
-copyfile( "./images", "button_italic.gif", $wgUploadDirectory );
-copyfile( "./images", "button_link.gif", $wgUploadDirectory );
-copyfile( "./images", "button_math.gif", $wgUploadDirectory );
-copyfile( "./images", "button_media.gif", $wgUploadDirectory );
-copyfile( "./images", "button_nowiki.gif", $wgUploadDirectory );
-copyfile( "./images", "button_sig.gif", $wgUploadDirectory );
-copyfile( "./images", "button_template.gif", $wgUploadDirectory );
+copyfile( "./images", "button_bold.png", $wgUploadDirectory );
+copyfile( "./images", "button_extlink.png", $wgUploadDirectory );
+copyfile( "./images", "button_headline.png", $wgUploadDirectory );
+copyfile( "./images", "button_hr.png", $wgUploadDirectory );
+copyfile( "./images", "button_image.png", $wgUploadDirectory );
+copyfile( "./images", "button_italic.png", $wgUploadDirectory );
+copyfile( "./images", "button_link.png", $wgUploadDirectory );
+copyfile( "./images", "button_math.png", $wgUploadDirectory );
+copyfile( "./images", "button_media.png", $wgUploadDirectory );
+copyfile( "./images", "button_nowiki.png", $wgUploadDirectory );
+copyfile( "./images", "button_sig.png", $wgUploadDirectory );
+copyfile( "./images", "button_template.png", $wgUploadDirectory );
+copyfile( "./images", "magnify-clip.png", $wgUploadDirectory );
+copyfile( "./images", "Arr_.png", $wgUploadDirectory );
+copyfile( "./images", "Arr_r.png", $wgUploadDirectory );
+copyfile( "./images", "Arr_d.png", $wgUploadDirectory );
+copyfile( "./images", "Arr_l.png", $wgUploadDirectory );
 
 copyfile( "./languages", "Language.php", $IP );
 copyfile( "./languages", "LanguageUtf8.php", $IP );
@@ -118,7 +129,9 @@ $rootpw=readconsole();
 
 # Include rest of code to get things like internationalized messages.
 #
-include_once( "{$IP}/Setup.php" );
+$wgUseDatabaseMessages = false; # no DB yet
+
+require_once( "{$IP}/Setup.php" );
 $wgTitle = Title::newFromText( "Installation script" );
 
 $wgDatabase = Database::newFromParams( $wgDBserver, "root", $rootpw, "", 1 );