[mxbb-commits] core/includes/sessions/phpbb2 core.php,1.20,1.21

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

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

Modified Files:
	core.php 
Log Message:
update

Index: core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb2/core.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** core.php	1 Nov 2008 15:11:48 -0000	1.20
--- core.php	28 Sep 2009 11:24:28 -0000	1.21
***************
*** 201,205 ****
  		// Load phpbb config.php (to get table prefix)
  		//
! 		@include_once($phpbb_root_path . 'config.' . $phpEx);
  
  		//
--- 201,208 ----
  		// Load phpbb config.php (to get table prefix)
  		//
! 		if ((include $phpbb_root_path . "config.$phpEx") === false)
! 		{
! 			die('Configuration file (config) ' . $phpbb_root_path . "/config.$phpEx" . ' couldn\'t be opened.');
! 		}
  
  		//
***************
*** 741,745 ****
  		}
  		else
! 		{
  			$sql = "SELECT *
  				FROM " . CONFIG_TABLE;
--- 744,755 ----
  		}
  		else
! 		{		
! 			if (!defined('CONFIG_TABLE'))
! 			{
! 				global $table_prefix, $mx_root_path;
! 				
! 				require $mx_root_path. "includes/sessions/phpbb3/constants.$phpEx";
! 			}		
! 		
  			$sql = "SELECT *
  				FROM " . CONFIG_TABLE;