há 11 anos atrás · eb309351af
--- a/other/install.php
+++ b/other/install.php
@@ -76,6 +76,7 @@ $databases = array(
 
 		'always_has_db' => true,
 
 		'utf8_default' => true,
 
 		'utf8_required' => true,
 
+		'utf8_support' => true,
 
 		'validate_prefix' => create_function('&$value', '
 
 			global $incontext, $txt;
 
 
@@ -944,9 +945,9 @@ function ForumSettings()
 
 		require(dirname(__FILE__) . '/Settings.php');
 
 
 
 		// UTF-8 requires a setting to override the language charset.
 
-		if (isset($_POST['utf8']) && !empty($databases[$db_type]['utf8_support']))
 
+		if ((!empty($databases[$db_type]['utf8_support']) && !empty($databases[$db_type]['utf8_required'])) || (empty($databases[$db_type]['utf8_required']) && !empty($databases[$db_type]['utf8_support']) && isset($_POST['utf8'])))
 
 		{
 
-			if (version_compare($databases[$db_type]['utf8_version'], preg_replace('~\-.+?$~', '', eval($databases[$db_type]['utf8_version_check'])), '>'))
 
+			if (!empty($databases[$db_type]['utf8_version_check']) && version_compare($databases[$db_type]['utf8_version'], preg_replace('~\-.+?$~', '', eval($databases[$db_type]['utf8_version_check'])), '>'))
 
 			{
 
 				$incontext['error'] = sprintf($txt['error_utf8_version'], $databases[$db_type]['utf8_version']);
 
 				return false;
@@ -1033,8 +1034,7 @@ function DatabasePopulation()
 
 	$replaces['{$default_reserved_names}'] = strtr($replaces['{$default_reserved_names}'], array('\\\\n' => '\\n'));
 
 
 
 	// If the UTF-8 setting was enabled, add it to the table definitions.
 
-	// @todo Very MySQL specific still
 
-	if ($db_type == 'mysql' && isset($_POST['utf8']) && !empty($databases[$db_type]['utf8_support']))
 
+	if (empty($databases[$db_type]['utf8_required']) && isset($_POST['utf8']) && !empty($databases[$db_type]['utf8_support']))
 
 		$replaces[') ENGINE=MyISAM;'] = ') ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;';
 
 
 
 	// Read in the SQL.  Turn this on and that off... internationalize... etc.
@@ -1110,7 +1110,7 @@ function DatabasePopulation()
 
 	}
 
 
 
 	// Make sure UTF will be used globally.
 
-	if (isset($_POST['utf8']) && !empty($databases[$db_type]['utf8_support']))
 
+	if ((!empty($databases[$db_type]['utf8_support']) && !empty($databases[$db_type]['utf8_required'])) || (empty($databases[$db_type]['utf8_required']) && !empty($databases[$db_type]['utf8_support']) && isset($_POST['utf8'])))
 
 		$smcFunc['db_insert']('replace',
 
 			$db_prefix . 'settings',
 
 			array(
--- a/other/install_2-1_postgresql.sql
+++ b/other/install_2-1_postgresql.sql
@@ -2132,7 +2132,7 @@ INSERT INTO {$db_prefix}scheduled_tasks	(id_task, next_time, time_offset, time_r
 
 INSERT INTO {$db_prefix}scheduled_tasks	(id_task, next_time, time_offset, time_regularity, time_unit, disabled, task) VALUES (10, 0, 120, 1, 'd', 1, 'paid_subscriptions');
 
 INSERT INTO {$db_prefix}scheduled_tasks	(id_task, next_time, time_offset, time_regularity, time_unit, disabled, task) VALUES (11, 0, 120, 1, 'd', 1, 'remove_temp_attachments');
 
 INSERT INTO {$db_prefix}scheduled_tasks	(id_task, next_time, time_offset, time_regularity, time_unit, disabled, task) VALUES (12, 0, 180, 1, 'd', 1, 'remove_topic_redirect');
 
-INSERT INTO {$db_prefix}scheduled_tasks	(id_task, next_time, time_offset, time_regularity, time_unit, disabled, task) VALUES (12, 0, 240, 1, 'd', 1, 'remove_old_drafts');
 
+INSERT INTO {$db_prefix}scheduled_tasks	(id_task, next_time, time_offset, time_regularity, time_unit, disabled, task) VALUES (13, 0, 240, 1, 'd', 1, 'remove_old_drafts');
 
 
 
 # --------------------------------------------------------
 
 
--- a/other/install_2-1_sqlite.sql
+++ b/other/install_2-1_sqlite.sql
@@ -1783,7 +1783,7 @@ INSERT INTO {$db_prefix}scheduled_tasks	(id_task, next_time, time_offset, time_r
 
 INSERT INTO {$db_prefix}scheduled_tasks	(id_task, next_time, time_offset, time_regularity, time_unit, disabled, task) VALUES (10, 0, 120, 1, 'd', 1, 'paid_subscriptions');
 
 INSERT INTO {$db_prefix}scheduled_tasks	(id_task, next_time, time_offset, time_regularity, time_unit, disabled, task) VALUES (11, 0, 120, 1, 'd', 1, 'remove_temp_attachments');
 
 INSERT INTO {$db_prefix}scheduled_tasks	(id_task, next_time, time_offset, time_regularity, time_unit, disabled, task) VALUES (12, 0, 180, 1, 'd', 1, 'remove_topic_redirect');
 
-INSERT INTO {$db_prefix}scheduled_tasks	(id_task, next_time, time_offset, time_regularity, time_unit, disabled, task) VALUES (12, 0, 240, 1, 'd', 1, 'remove_old_drafts');
 
+INSERT INTO {$db_prefix}scheduled_tasks	(id_task, next_time, time_offset, time_regularity, time_unit, disabled, task) VALUES (13, 0, 240, 1, 'd', 1, 'remove_old_drafts');
 
 COMMIT;
 
 
 
 # --------------------------------------------------------
--- a/other/upgrade_2-1_postgresql.sql
+++ b/other/upgrade_2-1_postgresql.sql
@@ -30,6 +30,20 @@ if (!isset($modSettings['package_make_full_backups']) && isset($modSettings['pac
 
 ---}
 
 ---#
 
 
 
+---# Adding back proper support for UTF8
 
+---{
 
+global $sourcedir;
 
+require_once($sourcedir . '/Subs-Admin.php');
 
+updateSettingsFile(array('db_character_set' => 'utf8'));
 
+
 
+upgrade_query("
 
+	INSERT INTO {$db_prefix}settings
 
+		(variable, value)
 
+	VALUES
 
+		('global_character_set', 'UTF-8')");
 
+---}
 
+---#
 
+
 
 /******************************************************************************/
 
 --- Updating legacy attachments...
 
 /******************************************************************************/
--- a/other/upgrade_2-1_sqlite.sql
+++ b/other/upgrade_2-1_sqlite.sql
@@ -28,6 +28,20 @@ if (!isset($modSettings['package_make_full_backups']) && isset($modSettings['pac
 
 ---}
 
 ---#
 
 
 
+---# Adding back proper support for UTF8
 
+---{
 
+global $sourcedir;
 
+require_once($sourcedir . '/Subs-Admin.php');
 
+updateSettingsFile(array('db_character_set' => 'utf8'));
 
+
 
+upgrade_query("
 
+	INSERT INTO {$db_prefix}settings
 
+		(variable, value)
 
+	VALUES
 
+		('global_character_set', 'UTF-8')");
 
+---}
 
+---#
 
+
 
 /******************************************************************************/
 
 --- Updating legacy attachments...
 
 /******************************************************************************/