From 6ebc8de14cec13bcfe37b7e21e28137a2db2ce24 Mon Sep 17 00:00:00 2001
From: "Paul S. Owen" <psotfx@users.sourceforge.net>
Date: Mon, 21 Oct 2002 14:10:45 +0000
Subject: bah, various issues, assign lang to this->lang via pointer(?)

git-svn-id: file:///svn/phpbb/trunk@2962 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/session.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes/session.php')

diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 3b4f5df354..18bd69f4ea 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -24,7 +24,7 @@ class session
 	var $session_id = '';
 	var $data = array();
 	var $browser = '';
-	var $user_ip = '';
+	var $ip = '';
 	var $page = '';
 	var $load;
 
@@ -388,6 +388,7 @@ class user extends session
 		{
 			include($this->lang_path . 'lang_admin.' . $phpEx);
 		}
+		$this->lang = &$lang;
 
 /*
 		if ( is_array($lang_set) )
@@ -759,7 +760,7 @@ class auth
 	// Authentication plug-ins is largely down to Sergey Kanareykin, our thanks to him.
 	function login($username, $password, $autologin = false)
 	{
-		global $board_config, $session, $phpEx;
+		global $board_config, $user, $phpEx;
 
 		$method = trim($board_config['auth_method']);
 
@@ -770,14 +771,13 @@ class auth
 			$method = 'login_' . $method;
 			if ( function_exists($method) )
 			{
-				if ( !($user = $method($username, $password)) )
+				if ( !($login = $method($username, $password)) )
 				{
 					return false;
 				}
 
 				$autologin = ( isset($autologin) ) ? md5($password) : '';
-
-				return ( $user['user_active'] ) ? $session->create($user['user_id'], $autologin) : false;
+				return ( $login['user_active'] ) ? $user->create($login['user_id'], $autologin) : false;
 			}
 		}
 
-- 
cgit v1.2.1