Переглянути джерело

! And let's fix the upgrader to update the old option choices to the new one.

Signed-off-by: Peter Spicer <[email protected]>
Peter Spicer 11 роки тому
батько
коміт
9858a699f5

+ 8 - 1
other/upgrade_2-1_mysql.sql

@@ -593,7 +593,14 @@ if (!empty($modSettings['time_format']))
 ---}
 ---#
 
----# Showing contact details to guests should never happen.
+---# Fixing a deprecated option.
+UPDATE {$db_prefix}settings
+SET value = 'option_css_resize'
+WHERE variable = 'avatar_action_too_large'
+	AND (value = 'option_html_resize' OR value = 'option_js_resize');
+---#
+
+---# Cleaning up old settings.
 DELETE FROM {$db_prefix}settings
 WHERE variable IN ('enableStickyTopics', 'guest_hideContacts', 'notify_new_registration', 'attachmentEncryptFilenames', 'hotTopicPosts', 'hotTopicVeryPosts');
 ---#

+ 8 - 1
other/upgrade_2-1_postgresql.sql

@@ -672,7 +672,14 @@ if (!empty($modSettings['time_format']))
 ---}
 ---#
 
----# Showing contact details to guests should never happen.
+---# Fixing a deprecated option.
+UPDATE {$db_prefix}settings
+SET value = 'option_css_resize'
+WHERE variable = 'avatar_action_too_large'
+	AND (value = 'option_html_resize' OR value = 'option_js_resize');
+---#
+
+---# Cleaning up old settings.
 DELETE FROM {$db_prefix}settings
 WHERE variable IN ('enableStickyTopics', 'guest_hideContacts', 'notify_new_registration', 'attachmentEncryptFilenames', 'hotTopicPosts', 'hotTopicVeryPosts');
 ---#

+ 8 - 1
other/upgrade_2-1_sqlite.sql

@@ -663,7 +663,14 @@ if (!empty($modSettings['time_format']))
 ---}
 ---#
 
----# Showing contact details to guests should never happen.
+---# Fixing a deprecated option.
+UPDATE {$db_prefix}settings
+SET value = 'option_css_resize'
+WHERE variable = 'avatar_action_too_large'
+	AND (value = 'option_html_resize' OR value = 'option_js_resize');
+---#
+
+---# Cleaning up old settings.
 DELETE FROM {$db_prefix}settings
 WHERE variable IN ('enableStickyTopics', 'guest_hideContacts', 'notify_new_registration', 'attachmentEncryptFilenames', 'hotTopicPosts', 'hotTopicVeryPosts');
 ---#