[mxbb-commits] core/install/includes functions_install.php, 1.20, 1.21

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

Update of /cvsroot/mxbb/core/install/includes
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv31295

Modified Files:
	functions_install.php 
Log Message:


Index: functions_install.php
===================================================================
RCS file: /cvsroot/mxbb/core/install/includes/functions_install.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** functions_install.php	30 Sep 2008 07:04:45 -0000	1.20
--- functions_install.php	11 Oct 2010 23:00:13 -0000	1.21
***************
*** 909,913 ****
  // Get the full phpBB URL by reading its config table.
  //
! function get_phpbb_url($table_prefix, $portal_backend)
  {
  	global $mx_root_path, $phpEx, $db;
--- 909,913 ----
  // Get the full phpBB URL by reading its config table.
  //
! function get_phpbb_url($table_prefix, $portal_backend = 'internal')
  {
  	global $mx_root_path, $phpEx, $db;
***************
*** 916,927 ****
  	
  	$sql = 'SELECT config_name, config_value
! 		FROM ' . $table_prefix . 'config' . $were_sql;
! 	$result = $db->sql_query($sql);
  
! 	while ($row = $db->sql_fetchrow($result))
  	{
  		$board_config[$row['config_name']] = $row['config_value'];
  	}
! 	$db->sql_freeresult($result);
  	
  	$server_protocol = ($board_config['cookie_secure']) ? 'https://' : 'http://';
--- 916,945 ----
  	
  	$sql = 'SELECT config_name, config_value
! 		FROM ' . $table_prefix . 'config'
! 		. $were_sql;
! 	if ( !($result = $db->sql_query($sql)) )
! 	{
! 		if (!function_exists('mx_message_die'))
! 		{
! 			global $db;
  
! 			$sql = "SELECT * FROM ".$table_prefix."config";
! 			if( !($result = $db->sql_query($sql)) )
! 			{
! 				print("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.");
! 				return false;
! 			}
! 		}
! 		else
! 		{
! 			mx_message_die( GENERAL_ERROR, 'Couldnt query config information', '', __LINE__, __FILE__, $sql );
! 		}
! 	}
! 
! 	while ( $row = $db->sql_fetchrow($result) )
  	{
  		$board_config[$row['config_name']] = $row['config_value'];
  	}
! 	$db->sql_freeresult($result);	
  	
  	$server_protocol = ($board_config['cookie_secure']) ? 'https://' : 'http://';