From: Tim Starling <tstarling@users.mediawiki.org>
Date: Tue, 26 Jul 2005 04:22:12 +0000 (+0000)
Subject: fixed proxy block message, arbitrarily changed session name fetch code
X-Git-Tag: 1.5.0beta4~23
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=1f675114718e39ba8d0de9b59ba1c652cd1c3e58;p=lhc%2Fweb%2Fwiklou.git

fixed proxy block message, arbitrarily changed session name fetch code
---

diff --git a/includes/SpecialUserlogin.php b/includes/SpecialUserlogin.php
index bb3e0c6a0f..84b36ccdb1 100644
--- a/includes/SpecialUserlogin.php
+++ b/includes/SpecialUserlogin.php
@@ -11,7 +11,7 @@
 function wfSpecialUserlogin() {
 	global $wgCommandLineMode;
 	global $wgRequest;
-	if( !$wgCommandLineMode && !isset( $_COOKIE[ini_get('session.name')] )  ) {
+	if( !$wgCommandLineMode && !isset( $_COOKIE[session_name()] )  ) {
 		User::SetupSession();
 	}
 	
@@ -190,7 +190,7 @@ class LoginForm {
 		if ( $wgEnableSorbs && !in_array( $wgIP, $wgProxyWhitelist ) && 
 		  $wgUser->inSorbsBlacklist( $wgIP ) ) 
 		{
-			$this->mainLoginForm( wfMsg( 'sorbs_create_account_reason' ) );
+			$this->mainLoginForm( wfMsg( 'sorbs_create_account_reason' ) . ' (' . htmlspecialchars( $wgIP ) . ')' );
 			return;
 		}