Fixed (potential) issues during update WCF 2.0 -> 2.1

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 36fb6f730e591e8957d9ba8c4a4a12b7923e2d64..8194bd10245c2c4db3dc5d6b53196855eb74cc07 100644 (file)
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -54,9 +54,9 @@
                <instruction type="file">files.tar</instruction>
                <instruction type="script">acp/update_com.woltlab.wcf_2.1.php</instruction>
                
-               <instruction type="template" run="standalone">templates_update.tar</instruction>
+               <instruction type="template" run="standalone">templates.tar</instruction>
                
-               <instruction type="acpTemplate" run="standalone">acptemplates_update.tar</instruction>
+               <instruction type="acpTemplate" run="standalone">acptemplates.tar</instruction>
                
                <instruction type="language" run="standalone">language/*.xml</instruction>
                
@@ -66,6 +66,7 @@
                <instruction type="sql" run="standalone">update_user2_210.sql</instruction>
                <instruction type="sql" run="standalone">update_user3_210.sql</instruction>
                <instruction type="sql" run="standalone">update_user4_210.sql</instruction>
+               <instruction type="sql" run="standalone">update_user5_210.sql</instruction>
                
                <instruction type="acpMenu">acpMenu.xml</instruction>
                <instruction type="bbcode">bbcode.xml</instruction>

diff --git a/com.woltlab.wcf/update_210.sql b/com.woltlab.wcf/update_210.sql
index c73c93fe1a7c17dbf0f0e45778f5c62b7310d910..a6e079fdaa60fd077f345e7706dedfdc87c27e0a 100644 (file)
--- a/com.woltlab.wcf/update_210.sql
+++ b/com.woltlab.wcf/update_210.sql
@@ -208,8 +208,6 @@ ALTER TABLE wcf1_template_listener ADD niceValue TINYINT(3) NOT NULL DEFAULT 0;
 
 ALTER TABLE wcf1_user_group_option ADD usersOnly TINYINT(1) NOT NULL DEFAULT 0;
 
-ALTER TABLE wcf1_user ADD gravatarFileExtension VARCHAR(3) NOT NULL DEFAULT '';
-
 /* truncate table to ensure consistency */
 DELETE FROM wcf1_user_notification;
 
@@ -220,8 +218,8 @@ ALTER TABLE wcf1_user_notification ADD userID INT(10) NOT NULL;
 ALTER TABLE wcf1_user_notification ADD mailNotified TINYINT(1) NOT NULL DEFAULT 0;
 ALTER TABLE wcf1_user_notification ADD confirmTime INT(10) NOT NULL DEFAULT 0;
 ALTER TABLE wcf1_user_notification ADD baseObjectID INT(10) NOT NULL DEFAULT 0;
-ALTER TABLE wcf1_user_notification ADD KEY (userID, eventID, objectID, confirmTime);
-ALTER TABLE wcf1_user_notification ADD KEY (userID, confirmTime);
+ALTER TABLE wcf1_user_notification ADD KEY userRelatedFields (userID, eventID, objectID, confirmTime);
+ALTER TABLE wcf1_user_notification ADD KEY userConfirmTime (userID, confirmTime);
 
 ALTER TABLE wcf1_user_notification_to_user DROP mailNotified;
 

diff --git a/com.woltlab.wcf/update_user5_210.sql b/com.woltlab.wcf/update_user5_210.sql
new file mode 100644 (file)
index 0000000..bde3881
--- /dev/null
+++ b/com.woltlab.wcf/update_user5_210.sql
@@ -0,0 +1 @@
+ALTER TABLE wcf1_user ADD gravatarFileExtension VARCHAR(3) NOT NULL DEFAULT '';