From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 13 Dec 2017 03:12:38 +0000 (+0100)
Subject: Fix #5952 - NameError (regression from #5762) (#5999)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=5706fe18c2803a33c5cd0beceb6a07ba4da0b5ba;p=mastodon.git

Fix #5952 - NameError (regression from #5762) (#5999)

* Fix #5952 - NameError (regression from #5762)

* Fix
---

diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb
index 20579ca63..ac0207a0a 100644
--- a/app/services/follow_service.rb
+++ b/app/services/follow_service.rb
@@ -22,7 +22,7 @@ class FollowService < BaseService
     elsif source_account.requested?(target_account)
       # This isn't managed by a method in AccountInteractions, so we modify it
       # ourselves if necessary.
-      req = follow_requests.find_by(target_account: other_account)
+      req = source_account.follow_requests.find_by(target_account: target_account)
       req.update!(show_reblogs: reblogs)
       return
     end