[mxbb-commits] core/includes mx_functions.php,1.115,1.116

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

Update of /cvsroot/mxbb/core/includes
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29297

Modified Files:
	mx_functions.php 
Log Message:


Index: mx_functions.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** mx_functions.php	5 Apr 2013 07:42:47 -0000	1.115
--- mx_functions.php	27 May 2013 00:24:05 -0000	1.116
***************
*** 687,691 ****
  		$server_protocol = ($server_protocol) ? $server_protocol : (($portal_config['cookie_secure']) ? 'https://' : 'http://');
  		$server_name = $portal_config['server_name'];
! 		$server_port = (int) $config['server_port'];
  		$script_path = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim($portal_config['script_path']));
  
--- 687,691 ----
  		$server_protocol = ($server_protocol) ? $server_protocol : (($portal_config['cookie_secure']) ? 'https://' : 'http://');
  		$server_name = $portal_config['server_name'];
! 		$server_port = (int) $portal_config['server_port'];
  		$script_path = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim($portal_config['script_path']));
  
***************
*** 2494,2498 ****
  		$db->sql_query($sql);
  
! 		if (!$db->sql_affectedrows() && !isset($config[$config_name]))
  		{
  			$sql = 'INSERT INTO ' . PORTAL_TABLE . ' ' . $db->sql_build_array('INSERT', array(
--- 2494,2498 ----
  		$db->sql_query($sql);
  
! 		if (!$db->sql_affectedrows() && !isset($portal_config[$config_name]))
  		{
  			$sql = 'INSERT INTO ' . PORTAL_TABLE . ' ' . $db->sql_build_array('INSERT', array(