[mxbb-commits] core/includes/db dbal.php, 1.14, 1.15 mysqli.php, 1.24, 1.25

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

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

Modified Files:
	dbal.php mysqli.php 
Log Message:



Index: dbal.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/db/dbal.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** dbal.php	16 Jun 2013 01:22:30 -0000	1.14
--- dbal.php	16 Jun 2013 01:38:28 -0000	1.15
***************
*** 439,443 ****
  				// If error occurs in initiating the session we need to use a pre-defined language string
  				// This could happen if the connection could not be established for example (then we are not able to grab the default language)
! 				if (!isset($user->lang['SQL_ERROR_OCCURRED']))
  				{
  					$message .= '<br /><br />An sql error occurred while fetching this page. Please contact an administrator if this problem persists.';
--- 439,443 ----
  				// If error occurs in initiating the session we need to use a pre-defined language string
  				// This could happen if the connection could not be established for example (then we are not able to grab the default language)
! 				if (!isset($lang['SQL_ERROR_OCCURRED']))
  				{
  					$message .= '<br /><br />An sql error occurred while fetching this page. Please contact an administrator if this problem persists.';
***************
*** 447,455 ****
  					if (!empty($config['board_contact']))
  					{
! 						$message .= '<br /><br />' . sprintf($user->lang['SQL_ERROR_OCCURRED'], '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>');
  					}
  					else
  					{
! 						$message .= '<br /><br />' . sprintf($user->lang['SQL_ERROR_OCCURRED'], '', '');
  					}
  				}
--- 447,455 ----
  					if (!empty($config['board_contact']))
  					{
! 						$message .= '<br /><br />' . sprintf($lang['SQL_ERROR_OCCURRED'], '<a href="mailto:' . htmlspecialchars($board_config['board_contact']) . '">', '</a>');
  					}
  					else
  					{
! 						$message .= '<br /><br />' . sprintf($lang['SQL_ERROR_OCCURRED'], '', '');
  					}
  				}