logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 5706fe18c2803a33c5cd0beceb6a07ba4da0b5ba
parent: 71965cbef2696e66be284c8ed11711ec46925603
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Wed, 13 Dec 2017 04:12:38 +0100

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

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

* Fix

Diffstat:

Mapp/services/follow_service.rb2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 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