|
From: FlorinCB <ory...@us...> - 2009-10-18 04:15:42
|
Update of /cvsroot/mxbb/core/includes/db In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4056 Modified Files: mssql.php mysql.php mysql4.php mysqli.php Log Message: fix Index: mysql4.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/mysql4.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** mysql4.php 1 Nov 2008 11:34:54 -0000 1.22 --- mysql4.php 18 Oct 2009 04:15:32 -0000 1.23 *************** *** 65,69 **** if (version_compare($this->mysql_version, '4.1.3', '>=')) { ! if (UTF_STATUS === 'phpbb3') { @mysql_query("SET NAMES 'utf8'", $this->db_connect_id); --- 65,69 ---- if (version_compare($this->mysql_version, '4.1.3', '>=')) { ! if (defined('UTF_STATUS') && (UTF_STATUS === 'phpbb3')) { @mysql_query("SET NAMES 'utf8'", $this->db_connect_id); Index: mysqli.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/mysqli.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** mysqli.php 1 Nov 2008 11:34:54 -0000 1.22 --- mysqli.php 18 Oct 2009 04:15:32 -0000 1.23 *************** *** 40,43 **** --- 40,44 ---- /** * Connect to server + * downgraded for phpBB2 backend */ function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false , $new_link = false) *************** *** 55,63 **** { // mysqli only supported by phpBB3 ! //if (UTF_STATUS === 'phpbb3') ! //{ ! @mysqli_query($this->db_connect_id, "SET NAMES 'utf8'"); ! // enforce strict mode on databases that support it ! //} if (mysqli_get_server_version($this->db_connect_id) >= 50002) { --- 56,63 ---- { // mysqli only supported by phpBB3 ! if (defined('UTF_STATUS') && (UTF_STATUS === 'phpbb3')) ! { ! @mysqli_query($this->db_connect_id, "SET NAMES 'utf8'"); // enforce strict mode on databases that support it ! } if (mysqli_get_server_version($this->db_connect_id) >= 50002) { *************** *** 88,92 **** return $this->sql_error(''); ! } /** --- 88,92 ---- return $this->sql_error(''); ! } /** Index: mssql.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/mssql.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** mssql.php 1 Nov 2008 11:34:54 -0000 1.19 --- mssql.php 18 Oct 2009 04:15:32 -0000 1.20 *************** *** 37,40 **** --- 37,41 ---- /** * Connect to server + * downgraded for phpBB2 backend */ function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false, $new_link = false) *************** *** 45,53 **** $this->dbname = $database; - if (UTF_STATUS === 'phpbb3') - { - @ini_set('mssql.charset', 'UTF-8'); - // enforce strict mode on databases that support it - } @ini_set('mssql.textlimit', 2147483647); @ini_set('mssql.textsize', 2147483647); --- 46,49 ---- |