fixed downgrade issie 236

StartupAPI · Aug 10, 2016 · 834215a · 834215a
1 parent 348dd2a
commit 834215a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/classes/User.php b/classes/User.php
@@ -588,14 +588,14 @@ public static function verifyEmailLinkCode($code, User $user = null) {
 			$query = 'UPDATE u_users
 						SET email_verified = 1,
 							email_verification_code = null,
-							email_verification_code_time = NOW()
+							email_verification_code_time = null
 						WHERE email_verification_code = ?
 							AND email_verification_code_time > DATE_SUB(NOW(), INTERVAL ? DAY)';
 		} else {
 			$query = 'UPDATE u_users
 						SET email_verified = 1,
 							email_verification_code = null,
-							email_verification_code_time = NOW()
+							email_verification_code_time = null
 						WHERE id = ?
 							AND email_verification_code = ?
 							AND email_verification_code_time > DATE_SUB(NOW(), INTERVAL ? DAY)';

diff --git a/dbupgrade.php b/dbupgrade.php
@@ -21,19 +21,19 @@
 
 /* -------------------------------------------------------------------------------------------------------
  * VERSION 36
- * corrected type 
+ * corrected type
 */
-$versions[36]['up'][] = "ALTER TABLE `u_user_badges` MODIFY COLUMN `time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP
+$versions[36]['up'][] = "ALTER TABLE `u_user_badges` MODIFY COLUMN `time` DATETIME NULL
 	COMMENT 'Time when user got the badge'";
-$versions[36]['up'][] = "ALTER TABLE `u_users` MODIFY COLUMN `email_verification_code_time` DATETIME DEFAULT CURRENT_TIMESTAMP 
+$versions[36]['up'][] = "ALTER TABLE `u_users` MODIFY COLUMN `email_verification_code_time` DATETIME NULL DEFAULT NULL
 	COMMENT 'Email verification code generation time'";
-$versions[36]['up'][] = "ALTER TABLE `u_users` MODIFY COLUMN `last_accessed` DATETIME  DEFAULT CURRENT_TIMESTAMP";
+$versions[36]['up'][]	= 'ALTER TABLE u_users DROP COLUMN last_accessed';
 
 $versions[36]['down'][] = "ALTER TABLE `u_user_badges` MODIFY COLUMN `time` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
   COMMENT 'Time when user got the badge'";
-$versions[36]['down'][] = "ALTER TABLE `u_users` MODIFY COLUMN `email_verification_code_time` timestamp NULL DEFAULT NULL  
+$versions[36]['down'][] = "ALTER TABLE `u_users` MODIFY COLUMN `email_verification_code_time` TIMESTAMP NULL  DEFAULT NULL
 	COMMENT 'Email verification code generation time'";
-$versions[36]['down'][] = "ALTER TABLE `u_users` MODIFY COLUMN `last_accessed` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP";
+$versions[36]['down'][]	= 'ALTER TABLE u_users ADD last_accessed DATETIME';
 
 /* -------------------------------------------------------------------------------------------------------
  * VERSION 35