[mxbb-commits] core/includes/sessions/phpbb3 core.php, 1.9, 1.10 session.php, 1.27, 1.28

[Jon O. <jon...@us...>]

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

Modified Files:
	core.php session.php 
Log Message:
A couple of fixes

Index: core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/core.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** core.php	15 Jul 2008 22:03:31 -0000	1.9
--- core.php	15 Jul 2008 22:53:57 -0000	1.10
***************
*** 253,261 ****
  		//
  		$this->sync_configs();
- 
- 		//
- 		// Dummy include, to make all original phpBB functions available
- 		//
- 		include_once($phpbb_root_path . 'includes/functions.' . $phpEx); // In case we need old functions...
  	}
  
--- 253,256 ----

Index: session.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/session.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** session.php	11 Jul 2008 22:00:24 -0000	1.27
--- session.php	15 Jul 2008 22:53:58 -0000	1.28
***************
*** 1346,1362 ****
  		else
  		{
! 			//Workaround by OryNider in this "else"
! 			$sql = "SELECT bbt.*
! 				FROM " . MX_THEMES_TABLE . " mxt, " . STYLES_TABLE . " bbt
! 				WHERE mxt.style_name = bbt.style_name
! 				AND mxt.portal_backend = 'phpbb3'
! 				AND mxt.themes_id = " . (int) $this->style;
! 			if ( !($result = $db->sql_query($sql, 120)) )
! 			{
! 				mx_message_die(CRITICAL_ERROR, 'Could not query database for theme info');
! 			}
! 			$this->phpbb_style = $db->sql_fetchrow($result);
! 			$db->sql_freeresult($result);
! 
  			// Set up style
  			$style = ($style) ? $style : ((!$board_config['override_user_style'] && $this->data['user_id'] != ANONYMOUS) ? $this->data['user_style'] : $this->phpbb_style['style_id']);
--- 1346,1350 ----
  		else
  		{
! 			$style = $this->style;
  			// Set up style
  			$style = ($style) ? $style : ((!$board_config['override_user_style'] && $this->data['user_id'] != ANONYMOUS) ? $this->data['user_style'] : $this->phpbb_style['style_id']);
***************
*** 1369,1372 ****
--- 1357,1361 ----
  				AND c.theme_id = s.theme_id
  				AND i.imageset_id = s.imageset_id";
+ 
  		if ( !($result = $db->sql_query($sql, 3600)) )
  		{