[mxbb-commits] core/includes/sessions/internal core.php,1.15,1.16

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/includes/sessions/internal
In directory vz-cvs-4.sog:/tmp/cvs-serv29890/sessions/internal

Modified Files:
	core.php 
Log Message:
other updates after php 5.3.4

Index: core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/internal/core.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** core.php	1 Nov 2008 13:55:22 -0000	1.15
--- core.php	30 Mar 2011 10:03:55 -0000	1.16
***************
*** 22,25 ****
--- 22,31 ----
  include_once($mx_root_path . 'includes/shared/phpbb3/includes/functions.' . $phpEx);
  
+ //
+ // Instantiate Dummy phpBB Classes
+ //
+ $phpBB2 = new phpBB2();
+ $phpBB3 = new phpBB3();
+ 
  /**
  * Backend specific tasks
***************
*** 237,241 ****
  	function dss_rand()
  	{
! 		global $db, $portal_config, $board_config, $dss_seeded;
  
  		$val = $portal_config['rand_seed'] . microtime();
--- 243,247 ----
  	function dss_rand()
  	{
! 		global $db, $portal_config, $board_config, $lang, $dss_seeded;
  
  		$val = $portal_config['rand_seed'] . microtime();
***************
*** 248,257 ****
  				rand_seed = '" . $portal_config['rand_seed'] . "'
  				WHERE portal_id = '1'";
! 
! 			if( !$db->sql_query($sql) )
  			{
  				mx_message_die(GENERAL_ERROR, "Unable to reseed PRNG", "", __LINE__, __FILE__, $sql);
  			}
! 
  			$dss_seeded = true;
  		}
--- 254,268 ----
  				rand_seed = '" . $portal_config['rand_seed'] . "'
  				WHERE portal_id = '1'";
! 				
! 			//display an error debuging message only if the portal is installed/upgraded 
! 			if(!@$db->sql_query($sql) && @!file_exists('install'))
  			{
  				mx_message_die(GENERAL_ERROR, "Unable to reseed PRNG", "", __LINE__, __FILE__, $sql);
  			}
! 			elseif(!@$db->sql_query($sql) && @file_exists('install'))
! 			{
! 				mx_message_die(GENERAL_ERROR, "Unable to reseed PRNG"."<br />Please finish upgrading and <br />".$lang['Please_remove_install_contrib'], "", __LINE__, __FILE__, $sql);
! 			}
! 			
  			$dss_seeded = true;
  		}