[mxbb-commits] core/includes/sessions/phpbb3 session.php, 1.18, 1.19

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

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

Modified Files:
	session.php 
Log Message:
some fix

Index: session.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/session.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** session.php	23 Jun 2008 09:07:08 -0000	1.18
--- session.php	26 Jun 2008 18:40:39 -0000	1.19
***************
*** 1706,1710 ****
  	function set_lang(&$lang, &$help, $lang_file, $use_db = false, $use_help = false)
  	{
! 		global $phpbb_root_path, $phpEx;
  
  		// Make sure the language path is set (if the user setup did not happen it is not set)
--- 1706,1710 ----
  	function set_lang(&$lang, &$help, $lang_file, $use_db = false, $use_help = false)
  	{
! 		global $lang, $phpbb_root_path, $phpEx; 
  
  		// Make sure the language path is set (if the user setup did not happen it is not set)
***************
*** 1729,1747 ****
  				$language_filename = $this->lang_path . (($use_help) ? 'help_' : '') . $lang_file . '.' . $phpEx;
  			}
- 
- 			if ((@include $language_filename) === false)
- 			{
- 				trigger_error('Language file ' . basename($language_filename) . ' couldn\'t be opened.', E_USER_ERROR);
- 			}
  			
! 			//this should be removed when gold
! 			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.');
  				}
! 			}			
  		}
  		else
--- 1729,1742 ----
  				$language_filename = $this->lang_path . (($use_help) ? 'help_' : '') . $lang_file . '.' . $phpEx;
  			}
  			
! 			//fix for mxp
! 			if ((@include $language_filename) === false)
  			{
  				//this will fix the path for anonymouse users
! 				if ((@include $phpbb_root_path . $language_filename) === false)
  				{
! 					die('Language file ' . $language_filename . ' couldn\'t be opened.');
  				}
! 			}
  		}
  		else
***************
*** 1752,1755 ****
--- 1747,1753 ----
  			die("You should not use db with MX-Publisher!");
  		}
+ 		
+ 		// We include common language file here to not load it every time a custom language file is included
+ 		$lang = &$this->lang;		
  	}