[mxbb-commits] core/includes/sessions/phpbb3 session.php, 1.37, 1.38

[FlorinCB <ory...@us...>]

Update of /cvsroot/mxbb/core/includes/sessions/phpbb3
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28720

Modified Files:
	session.php 
Log Message:
fixed

Index: session.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/session.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** session.php	7 Oct 2008 06:00:07 -0000	1.37
--- session.php	7 Oct 2008 09:12:07 -0000	1.38
***************
*** 1311,1325 ****
  		
  
! 		if (empty($lang['USER_LANG']))
! 		{		
! 			if ((@include $this->lang_path . "common.$phpEx") === false)
  			{
! 				//this will fix the path for anonymouse users
! 				if ((@include $phpbb_root_path . $this->lang_path . "common.$phpEx") === false)
! 				{
! 					die('Language file ' . $this->lang_path . "common.$phpEx" . ' couldn\'t be opened.');
! 				}
  			}
- 			$this->lang = &$lang;
  		}
  		
--- 1311,1321 ----
  		
  
! 		if ((@include $this->lang_path . "common.$phpEx") === false)
! 		{
! 			//this will fix the path for anonymouse users
! 			if ((@include $phpbb_root_path . $this->lang_path . "common.$phpEx") === false)
  			{
! 				die('Language file ' . $this->lang_path . "common.$phpEx" . ' couldn\'t be opened.');
  			}
  		}
  		
***************
*** 1327,1333 ****
  		// We include common language file here to not load it every time a custom language file is included
  		//
- 		$lang = &$this->lang;
- 		
  		$this->add_lang($lang_set);
  		unset($lang_set);
  	}
--- 1323,1328 ----
  		// We include common language file here to not load it every time a custom language file is included
  		//
  		$this->add_lang($lang_set);
+ 
  		unset($lang_set);
  	}
***************
*** 1895,1900 ****
  				return $img_data;
  			}
! 			//PHPBB_URL is not supported here for compatibility with phpBB2 backend use img() method
! 			$img_data['src'] = 'styles/' . $this->theme['imageset_path'] . '/imageset/' . ($this->img_array[$img]['image_lang'] ? $this->img_array[$img]['image_lang'] .'/' : '') . $this->img_array[$img]['image_filename'];
  			$img_data['width'] = $this->img_array[$img]['image_width'];
  			$img_data['height'] = $this->img_array[$img]['image_height'];
--- 1890,1895 ----
  				return $img_data;
  			}
! 
! 			$img_data['src'] = PHPBB_URL . 'styles/' . $this->theme['imageset_path'] . '/imageset/' . ($this->img_array[$img]['image_lang'] ? $this->img_array[$img]['image_lang'] .'/' : '') . $this->img_array[$img]['image_filename'];
  			$img_data['width'] = $this->img_array[$img]['image_width'];
  			$img_data['height'] = $this->img_array[$img]['image_height'];