Bug 506: use $_SERVER[] instead of getenv() because the latter doesn't work

on IIS in ISAPI mode.

diff --git a/LocalSettings.sample b/LocalSettings.sample
index 829e968..04fb97b 100644 (file)
--- a/LocalSettings.sample
+++ b/LocalSettings.sample
@@ -74,8 +74,8 @@ $wgLogo                               = "{$wgStylePath}/images/wiki.png";
 
 ## Preferably these addresses should be able to receive mail asking for help
 #
-$wgEmergencyContact = "wikiadmin@" . getenv( "SERVER_NAME" );
-$wgPasswordSender      = "Wikipedia Mail <apache@" . getenv( "SERVER_NAME" ) . ">";
+$wgEmergencyContact = "wikiadmin@" . $_SERVER['SERVER_NAME'];
+$wgPasswordSender      = "Wikipedia Mail <apache@" . $_SERVER['SERVER_NAME'] . ">";
 
 # MySQL settings
 #

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 5401b42..0319147 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -117,14 +117,15 @@ $wgTmpDirectory     = "{$wgUploadDirectory}/tmp";
  * Default to wikiadmin@SERVER_NAME
  * @global string $wgEmergencyContact
  */
-$wgEmergencyContact = 'wikiadmin@' . getenv( 'SERVER_NAME' );
+$wgEmergencyContact = 'wikiadmin@' . $_SERVER['SERVER_NAME'];
+
 /**
  * Password reminder email address
  * The address we should use as sender when a user is requesting his password
  * Default to apache@SERVER_NAME
  * @global string $wgPasswordSender
  */
-$wgPasswordSender      = 'Wikipedia Mail <apache@' . getenv( 'SERVER_NAME' ) . '>';
+$wgPasswordSender      = 'Wikipedia Mail <apache@' . $_SERVER['SERVER_NAME'] . '>';
 
 
 /**

diff --git a/includes/Setup.php b/includes/Setup.php
index c04f287..ce499d4 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -41,7 +41,7 @@ if( $wgUseSquid && isset( $_SERVER['HTTP_X_FORWARDED_FOR'] ) ) {
        }
        $wgIP = trim(end($hopips));
 } else {
-       $wgIP = getenv('REMOTE_ADDR');
+       $wgIP = $_SERVER['REMOTE_ADDR'];
 }