Version 4.1.2

admin/convertutf8/system/Db/Db.php

@@ -61,6 +61,11 @@ class Db extends \mysqli
 	 * @brief	Multiton Store
 	 */
 	protected static $multitons;
+	
+	/**
+	 * @brief	Return Query
+	 */
+	public $returnQuery = FALSE;
 
 	/**
 	 * Get instance
@@ -111,7 +116,30 @@ class Db extends \mysqli
 			{
 				throw new \IPSUtf8\Db\Exception( $error, self::$multitons[ $identifier ]->connect_errno );
 			}
-
+			
+			/* If we succeeded, set the charset */
+			if ( mb_substr( $identifier, 0, 4 ) == 'utf8' )
+			{
+				/* UTF8MB4? */
+				if ( isset( $connectionSettings['sql_utf8mb4'] ) and $connectionSettings['sql_utf8mb4'] )
+				{
+					self::$multitons[ $identifier ]->charset = 'utf8mb4';
+					self::$multitons[ $identifier ]->collation = 'utf8mb4_unicode_ci';
+					self::$multitons[ $identifier ]->binaryCollation = 'utf8mb4_bin';
+				}
+				
+				/* If we succeeded, set the charset */
+				if ( !self::$multitons[ $identifier ]->set_charset( self::$multitons[ $identifier ]->charset ) )
+				{
+					/* Fallback to UTF8 */
+					self::$multitons[ $identifier ]->charset = 'utf8';
+					self::$multitons[ $identifier ]->collation = 'utf8_unicode_ci';
+					self::$multitons[ $identifier ]->binaryCollation = 'utf8_bin';
+					
+					self::$multitons[ $identifier ]->set_charset( 'utf8' );
+				}
+			}
+			
 			/* Set the prefix */
 			if ( isset( $connectionSettings['sql_tbl_prefix'] ) )
 			{
@@ -148,12 +176,6 @@ class Db extends \mysqli
 	 */
 	public $prefix = '';
 	
-	/**
-	 * @brief	Return the query instead of executing it
-	 * @note	Only designed to work with methods that call query() vs prepared statements
-	 */
-	public $returnQuery	= FALSE;
-	
 	/**
 	 * Run a query
 	 *