| Index: trunk/phase3/LocalSettings.sample |
| — | — | @@ -74,8 +74,8 @@ |
| 75 | 75 | |
| 76 | 76 | ## Preferably these addresses should be able to receive mail asking for help |
| 77 | 77 | # |
| 78 | | -$wgEmergencyContact = "wikiadmin@" . getenv( "SERVER_NAME" ); |
| 79 | | -$wgPasswordSender = "Wikipedia Mail <apache@" . getenv( "SERVER_NAME" ) . ">"; |
| | 78 | +$wgEmergencyContact = "wikiadmin@" . $_SERVER['SERVER_NAME']; |
| | 79 | +$wgPasswordSender = "Wikipedia Mail <apache@" . $_SERVER['SERVER_NAME'] . ">"; |
| 80 | 80 | |
| 81 | 81 | # MySQL settings |
| 82 | 82 | # |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -117,14 +117,15 @@ |
| 118 | 118 | * Default to wikiadmin@SERVER_NAME |
| 119 | 119 | * @global string $wgEmergencyContact |
| 120 | 120 | */ |
| 121 | | -$wgEmergencyContact = 'wikiadmin@' . getenv( 'SERVER_NAME' ); |
| | 121 | +$wgEmergencyContact = 'wikiadmin@' . $_SERVER['SERVER_NAME']; |
| | 122 | + |
| 122 | 123 | /** |
| 123 | 124 | * Password reminder email address |
| 124 | 125 | * The address we should use as sender when a user is requesting his password |
| 125 | 126 | * Default to apache@SERVER_NAME |
| 126 | 127 | * @global string $wgPasswordSender |
| 127 | 128 | */ |
| 128 | | -$wgPasswordSender = 'Wikipedia Mail <apache@' . getenv( 'SERVER_NAME' ) . '>'; |
| | 129 | +$wgPasswordSender = 'Wikipedia Mail <apache@' . $_SERVER['SERVER_NAME'] . '>'; |
| 129 | 130 | |
| 130 | 131 | |
| 131 | 132 | /** |
| Index: trunk/phase3/includes/Setup.php |
| — | — | @@ -41,7 +41,7 @@ |
| 42 | 42 | } |
| 43 | 43 | $wgIP = trim(end($hopips)); |
| 44 | 44 | } else { |
| 45 | | - $wgIP = getenv('REMOTE_ADDR'); |
| | 45 | + $wgIP = $_SERVER['REMOTE_ADDR']; |
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | |