diff --git a/web/concrete/config/base.php b/web/concrete/config/base.php
index <HASH>..<HASH> 100644
--- a/web/concrete/config/base.php
+++ b/web/concrete/config/base.php
@@ -106,7 +106,7 @@ if (!defined('DB_CHARSET')) {
 }
 
 if (!defined("DB_COLLATE")) {
-	define('DB_COLLATE', '');
+	define('DB_COLLATE', 'utf8_unicode_ci');
 }
 
 define("LANGUAGE_DOMAIN_CORE", "messages");
diff --git a/web/concrete/core/controllers/single_pages/upgrade.php b/web/concrete/core/controllers/single_pages/upgrade.php
index <HASH>..<HASH> 100644
--- a/web/concrete/core/controllers/single_pages/upgrade.php
+++ b/web/concrete/core/controllers/single_pages/upgrade.php
@@ -25,6 +25,7 @@ class Concrete5_Controller_Upgrade extends Controller {
 		Cache::disableCache();
 		Cache::disableLocalCache();
 		$this->site_version = Config::get('SITE_APP_VERSION');
+		Database::ensureEncoding();
 	}
 	
 	public function view() {
maintaining unicode on upgrade


Former-commit-id: <I>ec4e5de7f<I>e<I>a<I>d<I>b<I>ceb<I>f