UTF-8 Multibyte (utf8mb4) support

Use utf8mb4 if available when creating a database or updating its character set using the JDatabaseDriver methods.
joomla · Jun 13, 2015 · 854d77d · 854d77d
1 parent e3c8bda
commit 854d77d
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/libraries/joomla/database/driver.php b/libraries/joomla/database/driver.php
@@ -626,7 +626,9 @@ abstract public function getAffectedRows();
 	 */
 	protected function getAlterDbCharacterSet($dbName)
 	{
-		return 'ALTER DATABASE ' . $this->quoteName($dbName) . ' CHARACTER SET `utf8`';
+		$charset = $this->utf8mb4 ? 'utf8mb4' : 'utf8';
+
+		return 'ALTER DATABASE ' . $this->quoteName($dbName) . ' CHARACTER SET `' . $charset .'`';
 	}
 
 	/**
@@ -645,7 +647,9 @@ protected function getCreateDatabaseQuery($options, $utf)
 	{
 		if ($utf)
 		{
-			return 'CREATE DATABASE ' . $this->quoteName($options->db_name) . ' CHARACTER SET `utf8`';
+			$charset = $this->utf8mb4 ? 'utf8mb4' : 'utf8';
+
+			return 'CREATE DATABASE ' . $this->quoteName($options->db_name) . ' CHARACTER SET `' . $charset . '`';
 		}
 
 		return 'CREATE DATABASE ' . $this->quoteName($options->db_name);