Version 4.1.19

admin/convertutf8/system/Db/Db.php

@@ -2,9 +2,9 @@
 /**
  * @brief		Database Class
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @since		18 Feb 2013
  * @version		SVN_VERSION_NUMBER
  */
@@ -225,11 +225,20 @@ class Db extends \mysqli
 	 */
 	public function set_charset( $charset )
 	{
-		if ( $charset === 'utf8mb4' )
+		if ( mb_substr( $charset, 0, 4 ) == 'utf8' )
 		{
-			$this->charset         = 'utf8mb4';
-			$this->collation       = 'utf8mb4_unicode_ci';
-			$this->binaryCollation = 'utf8mb4_bin';
+			if ( $charset === 'utf8mb4' )
+			{
+				$this->charset         = 'utf8mb4';
+				$this->collation       = 'utf8mb4_unicode_ci';
+				$this->binaryCollation = 'utf8mb4_bin';
+			}
+			else
+			{
+				$this->charset			= 'utf8';
+				$this->collation		= 'utf8_unicode_ci';
+				$this->binaryCollation	= 'utf8_bin';
+			}
 		}
 		
 		return parent::set_charset( $charset );