From 4a00772c199b18c49c4b16c2299a08712ec83ca7 Mon Sep 17 00:00:00 2001
From: Tarek Khalil <45508821+khalilovcmded@users.noreply.github.com>
Date: Tue, 12 Mar 2019 13:32:25 +0000
Subject: [PATCH] FIX: invite approval `StaffActionLogger` bug (#7151)

* FIX: invite approval `StaffActionLogger` bug
---
 app/models/invite_redeemer.rb |  2 +-
 app/models/user.rb            | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/app/models/invite_redeemer.rb b/app/models/invite_redeemer.rb
index bbf40ef0d20..2f63d50805e 100644
--- a/app/models/invite_redeemer.rb
+++ b/app/models/invite_redeemer.rb
@@ -133,7 +133,7 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password, :user_custom_f
 
   def approve_account_if_needed
     if get_existing_user
-      invited_user.approve(invite.invited_by_id, false)
+      invited_user.approve(invite.invited_by, false)
     end
   end
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 09ae5c6c2e3..4c2710358c4 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -405,23 +405,17 @@ class User < ActiveRecord::Base
   end
 
   # Approve this user
-  def approve(approved_by, send_mail = true)
+  def approve(approver, send_mail = true)
     self.approved = true
-
-    if approved_by.is_a?(Integer)
-      self.approved_by_id = approved_by
-    else
-      self.approved_by = approved_by
-    end
-
     self.approved_at = Time.zone.now
+    self.approved_by = approver
 
     if result = save
       send_approval_email if send_mail
       DiscourseEvent.trigger(:user_approved, self)
     end
 
-    StaffActionLogger.new(approved_by).log_user_approve(self)
+    StaffActionLogger.new(approver).log_user_approve(self)
 
     result
   end