Merge pull request #9328 from andrepereiradasilva/patch-2

Solves 9326: clean beta 4 install without pre-created database doesn't work
joomla · Mar 7, 2016 · 51a8fde · 51a8fde
2 parents c8a23b4 + 7cacd55
commit 51a8fde
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/libraries/joomla/database/driver.php b/libraries/joomla/database/driver.php
@@ -854,6 +854,7 @@ protected function getCreateDatabaseQuery($options, $utf)
 		if ($utf)
 		{
 			$charset = $this->utf8mb4 ? 'utf8mb4' : 'utf8';
+			$collation = $charset . '_unicode_ci';
 
 			return 'CREATE DATABASE ' . $this->quoteName($options->db_name) . ' CHARACTER SET `' . $charset . '` COLLATE `' . $collation . '`';
 		}