[mxbb-commits] core/includes/sessions/phpbb3 session.php, 1.28, 1.29

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

Update of /cvsroot/mxbb/core/includes/sessions/phpbb3
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25352

Modified Files:
	session.php 
Log Message:
this fix is great 4 loading phpbb3 common language

Index: session.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/session.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** session.php	15 Jul 2008 22:53:58 -0000	1.28
--- session.php	20 Jul 2008 02:06:16 -0000	1.29
***************
*** 1307,1327 ****
  			$this->dst = $board_config['board_dst'] * 3600;
  		}
  
  		//
  		// We include common language file here to not load it every time a custom language file is included
  		//
  		$lang = &$this->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->add_lang($lang_set);
- 
  		unset($lang_set);
  	}
--- 1307,1331 ----
  			$this->dst = $board_config['board_dst'] * 3600;
  		}
+ 		
  
+ 		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;
+ 		}
+ 		
  		//
  		// 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);
  	}
***************
*** 1740,1744 ****
  
  		// We include common language file here to not load it every time a custom language file is included
! 		$lang = &$this->lang;
  	}
  
--- 1744,1748 ----
  
  		// We include common language file here to not load it every time a custom language file is included
! 		$this->lang = &$lang;
  	}