[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[27401] branches/5.x/db/tiki-db-pdo.php

[<ny...@us...>]

Revision: 27401
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=27401&view=rev
Author:   nyloth
Date:     2010-05-31 14:33:24 +0000 (Mon, 31 May 2010)

Log Message:
-----------
[FIX] workaround for specifying client charset with PDO and PHP 5.3.0

Modified Paths:
--------------
    branches/5.x/db/tiki-db-pdo.php

Modified: branches/5.x/db/tiki-db-pdo.php
===================================================================
--- branches/5.x/db/tiki-db-pdo.php	2010-05-31 14:12:59 UTC (rev 27400)
+++ branches/5.x/db/tiki-db-pdo.php	2010-05-31 14:33:24 UTC (rev 27401)
@@ -58,9 +58,20 @@
 	}
 
 	if ( ! $conn ) {
-		$dbTiki = new PDO( "$db_tiki:$db_hoststring;dbname=$dbs_tiki", $user_tiki, $pass_tiki,
-			array( PDO::MYSQL_ATTR_INIT_COMMAND => "SET CHARACTER SET $client_charset" )
-		);
+	
+		$charset_query = "SET CHARACTER SET $client_charset";
+		if ( defined('PDO::MYSQL_ATTR_NIT_COMMAND' ) ) {
+			$dbTiki = new PDO( "$db_tiki:$db_hoststring;dbname=$dbs_tiki", $user_tiki, $pass_tiki,
+				array( PDO::MYSQL_ATTR_INIT_COMMAND => $charset_query )
+			);
+		} else {
+			// PHP 5.3.0 seems buggy and may need this query - see http://bugs.php.net/bug.php?id=47224
+			//   but this method is just a workaround because it may not work if PHP tries to reconnect to the DB after loosing the connection
+			//
+			$dbTiki = new PDO( "$db_tiki:$db_hoststring;dbname=$dbs_tiki", $user_tiki, $pass_tiki );
+			$dbTiki->exec( $charset_query );
+		}
+		unset( $charset_query );
 
 		$dbTiki->setAttribute(PDO::ATTR_CASE,PDO::CASE_NATURAL);
 		$dbTiki->setAttribute(PDO::ATTR_ERRMODE,PDO::ERRMODE_WARNING);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.