diff options
| author | Mark Felder <feld@FreeBSD.org> | 2019-06-03 15:29:53 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2019-06-03 15:29:53 -0500 |
| commit | 6ef145b4fc3f2ddb5865e84039c3b56656529711 (patch) | |
| tree | a10cab9e7561bdaa76777cfc6d0c3c6fe1f8189b /lib/pleroma/web/twitter_api/twitter_api_controller.ex | |
| parent | 5cee2fe9fea4f0c98acd49a2a288ecd44bce3d1f (diff) | |
| parent | 662e95e9484a46bfc72c2edc305aefae99ff68b0 (diff) | |
| download | pleroma-6ef145b4fc3f2ddb5865e84039c3b56656529711.tar.gz | |
Merge branch 'develop' into feature/digest-email
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api_controller.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex index 31e86685a..1b6b33e69 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -728,7 +728,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do def only_if_public_instance(%{assigns: %{user: %User{}}} = conn, _), do: conn def only_if_public_instance(conn, _) do - if Keyword.get(Application.get_env(:pleroma, :instance), :public) do + if Pleroma.Config.get([:instance, :public]) do conn else conn |