diff options
| author | lain <lain@soykaf.club> | 2019-10-05 10:42:29 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-10-05 10:42:29 +0200 |
| commit | d9aaea44ff02d6a07d3be0f0675830eb51ac85ef (patch) | |
| tree | ce715c85f98875dd0ddf133f95a071fd40b91335 /lib/pleroma/web/oauth/oauth_controller.ex | |
| parent | 8e83c8423fa846e82103b20798f0cbde676354ff (diff) | |
| parent | 9c47d8571c6c46503d9bb836aea933eda6e9e0a5 (diff) | |
| download | pleroma-d9aaea44ff02d6a07d3be0f0675830eb51ac85ef.tar.gz | |
Merge remote-tracking branch 'origin/develop' into reactions
Diffstat (limited to 'lib/pleroma/web/oauth/oauth_controller.ex')
| -rw-r--r-- | lib/pleroma/web/oauth/oauth_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex index e418dc70d..1cd7294e7 100644 --- a/lib/pleroma/web/oauth/oauth_controller.ex +++ b/lib/pleroma/web/oauth/oauth_controller.ex @@ -460,7 +460,7 @@ defmodule Pleroma.Web.OAuth.OAuthController do end # Special case: Local MastodonFE - defp redirect_uri(%Plug.Conn{} = conn, "."), do: mastodon_api_url(conn, :login) + defp redirect_uri(%Plug.Conn{} = conn, "."), do: auth_url(conn, :login) defp redirect_uri(%Plug.Conn{}, redirect_uri), do: redirect_uri |