From da74ac8e14635856c75d463b1b1b70548a8c9cb1 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sat, 1 May 2004 07:03:53 +0000
Subject: [PATCH] Forward port install fixes for 1.2.5: * Don't forget to grant
 user privs with blank root pw install * Acknowledge 'apache2handler' as ok
 for pretty URLs * Add link to http://meta.wikipedia.org/wiki/MediaWiki_i18n  
 in the initial main page (#1 FAQ is "how do I change 'From X,   the free
 encyclopedia'")

---
 RELEASE-NOTES          | 9 +++++++++
 config/index.php       | 8 ++++++--
 languages/Language.php | 2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4aea33fbd3..1ec7b6de85 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -49,6 +49,15 @@ cases, but this is not recommended on live sites. (This must be set for
 MathML to display properly in Mozilla.)
 
 
+== Version 1.2.5, 2004-05-01 ==
+* Fixed install problem with blank root password
+* Fixed Special:Emailuser/Username links
+* Fixed main-page edit links on fuzzy search results
+* Fixed wikipedia-interwiki.sql
+* Fixed install with apache2filter (ugly URLs)
+* IP in 'go' search brings up contributions
+* Switch from broken & to ? on top-level wiki URL hack
+
 == Version 1.2.4, 2004-04-13 ==
 
 * Fixed edit toolbar in Mozilla
diff --git a/config/index.php b/config/index.php
index 7bac14afea..f99f217fed 100644
--- a/config/index.php
+++ b/config/index.php
@@ -184,6 +184,7 @@ $conf->prettyURLs = true;
 print "<li>PHP server API is $sapi; ";
 switch( $sapi ) {
 case "apache":
+case "apache2handler":
 	print "ok, using pretty URLs (<tt>index.php/Page_Title</tt>)";
 	break;
 case "cgi":
@@ -308,7 +309,10 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 		$wgDatabase->mIgnoreErrors = true;
 		
 		@$myver = mysql_get_server_info( $wgDatabase->mConn );
-		if( !$myver ) {
+		if( $myver ) {
+			$conf->Root = true;
+			print "<li>Connected as root (automatic)</li>\n";
+		} else {
 			print "<li>MySQL error " . ($err = mysql_errno() ) .
 				": " . htmlspecialchars( mysql_error() );
 			$ok = false;
@@ -455,7 +459,7 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 			print "</pre></li>\n";
 			
 			if( $conf->Root ) {
-				# Grant user permissions
+				print "<li>Granting user permissions...</li>\n";
 				dbsource( "../maintenance/users.sql", $wgDatabase );
 			}
 		}
diff --git a/languages/Language.php b/languages/Language.php
index 589211a14c..a54646531f 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -467,7 +467,7 @@ $wgLanguageNamesEn =& $wgLanguageNames;
 
 "linktrail"		=> "/^([a-z]+)(.*)\$/sD",
 "mainpage"		=> "Main Page",
-"mainpagetext"	=> "Wiki software successfully installed.",
+"mainpagetext"	=> "Wiki software successfully installed.\n\nPlease see [http://meta.wikipedia.org/wiki/MediaWiki_i18n documentation on customizing the interface].",
 'portal'		=> 'Community portal',
 'portal-url'		=> '{{ns:4}}:Community Portal',
 "about"			=> "About",
-- 
2.20.1