From: Hinaloe <hina@hinaloe.net>
Date: Wed, 20 Feb 2019 16:47:38 +0000 (+0900)
Subject: correct opt-out showing application (#10086)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=4340d338fd2aa5665ffb2eb0cd54d689997234fe;p=mastodon.git

correct opt-out showing application (#10086)

* correct opt-out showing application

refs #9994

* Revert "correct opt-out showing application"

This reverts commit 0e9bb70f145be42962416a6b87c08d59a2896486.

* User#shows_application? calls wrong value
---

diff --git a/app/models/user.rb b/app/models/user.rb
index 7432e3da8..83816def5 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -245,7 +245,7 @@ class User < ApplicationRecord
   end
 
   def shows_application?
-    @shows_application ||= settings.shows_application
+    @shows_application ||= settings.show_application
   end
 
   def token_for_app(a)