fixes #2890: Danbooru account upgrades reset permissions

2017-02-21 12:39:45 -08:00
parent 176510909a
commit 6ca83a2f3c
2 changed files with 13 additions and 6 deletions
--- a/app/logical/user_promotion.rb
+++ b/app/logical/user_promotion.rb
@@ -15,8 +15,15 @@ class UserPromotion
    @old_can_upload_free = user.can_upload_free?

    user.level = new_level
-    user.can_approve_posts = options[:can_approve_posts]
-    user.can_upload_free = options[:can_upload_free]
+
+    if options.has_key?(:can_approve_posts)
+      user.can_approve_posts = options[:can_approve_posts]
+    end
+
+    if options.has_key?(:can_upload_free)
+      user.can_upload_free = options[:can_upload_free]
+    end
+    
    user.inviter_id = promoter.id

    create_user_feedback unless options[:skip_feedback]