mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-22 07:20:11 +02:00
Code Issues Releases Wiki Activity

make sure user->setup() works even if there is no valid session

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@9291 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2009-01-22 12:47:08 +00:00
parent 121116cae3
commit 04fdca03b3
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
phpBB/includes/classes/user.php
View File

@ -2,7 +2,7 @@
/** /**
* *
* @package phpBB3 * @package phpBB3
* @version $Id: user.php 9205 2008-12-18 18:08:57Z acydburn $ * @version $Id$
* @copyright (c) 2005, 2008 phpBB Group * @copyright (c) 2005, 2008 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License * @license http://opensource.org/licenses/gpl-license.php GNU Public License
* *
@ -225,6 +225,17 @@ class phpbb_user extends phpbb_session
*/ */
public function setup($lang_set = false, $style = false) public function setup($lang_set = false, $style = false)
{ {
// Check if there is a valid session
if (empty($this->data))
{
$this->session_begin();
if (phpbb::registered('acl'))
{
phpbb::$acl->init($this->data);
}
}
if ($this->data['user_id'] != ANONYMOUS) if ($this->data['user_id'] != ANONYMOUS)
{ {
$this->lang_name = (file_exists($this->lang_path . $this->data['user_lang'] . "/common." . PHP_EXT)) ? $this->data['user_lang'] : basename(phpbb::$config['default_lang']); $this->lang_name = (file_exists($this->lang_path . $this->data['user_lang'] . "/common." . PHP_EXT)) ? $this->data['user_lang'] : basename(phpbb::$config['default_lang']);