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

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

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

Modified Files:
	core.php 
Log Message:
?

Index: core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/core.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** core.php	28 Sep 2009 11:24:28 -0000	1.19
--- core.php	22 Nov 2009 21:59:00 -0000	1.20
***************
*** 722,742 ****
  				require $mx_root_path. "includes/sessions/phpbb3/constants.$phpEx";
  			}
  
! 			$sql = "SELECT *
! 				FROM " . CONFIG_TABLE;
  
! 			if ( !( $result = $db->sql_query( $sql ) ) )
! 			{
! 				if (!function_exists('mx_message_die'))
! 				{
! 					die("Couldnt query config information, Allso this hosting or server is using a cache optimizer not compatible with MX-Publisher or just lost connection to database wile query.");
! 				}
! 				else
! 				{
! 					mx_message_die( GENERAL_ERROR, 'Couldnt query config information', '', __LINE__, __FILE__, $sql );
! 				}
! 			}
  
! 			while ( $row = $db->sql_fetchrow($result) )
  			{
  				$config[$row['config_name']] = $row['config_value'];
--- 722,769 ----
  				require $mx_root_path. "includes/sessions/phpbb3/constants.$phpEx";
  			}
+ 			
+ 			switch (PORTAL_BACKEND)
+ 			{
+ 				case 'internal':
  
! 				case 'phpbb2':
  
! 					$sql = "SELECT *
! 						FROM " . CONFIG_TABLE;
  
! 					if (!($result = $db->sql_query($sql)))
! 					{
! 						if (!function_exists('mx_message_die'))
! 						{
! 							@die("Couldnt query config information, Allso this hosting or server is using a cache optimizer not compatible with MX-Publisher or just lost connection to database wile query.");
! 						}
! 						else
! 						{
! 							mx_message_die(GENERAL_ERROR, 'Couldnt query config information, Database connection lost?', '', __LINE__, __FILE__, $sql);
! 						}
! 					}
! 
! 				break;
! 
! 				case 'phpbb3':
! 
! 					$sql = 'SELECT config_name, config_value
! 						FROM ' . CONFIG_TABLE . '
! 						WHERE is_dynamic = 1';
! 					if (!($result = $db->sql_query($sql)))
! 					{
! 						if (!function_exists('mx_message_die'))
! 						{
! 							@die("Couldnt query config information, Allso this hosting or server is using a cache optimizer not compatible with MX-Publisher or just lost connection to database wile query.");
! 						}
! 						else
! 						{
! 							mx_message_die(GENERAL_ERROR, 'Couldnt query config information, Database connection lost?', '', __LINE__, __FILE__, $sql);
! 						}
! 					}
! 				break;
! 			}
! 			
! 			while ($row = $db->sql_fetchrow($result))
  			{
  				$config[$row['config_name']] = $row['config_value'];
***************
*** 748,753 ****
  				$mx_cache->put('phpbb_config', $config);
  			}
! 
! 			return ( $config );
  		}
  	}
--- 775,779 ----
  				$mx_cache->put('phpbb_config', $config);
  			}
! 			return ($config);			
  		}
  	}