diff options
| author | lain <lain@soykaf.club> | 2019-10-04 11:27:30 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-10-04 11:27:30 +0000 |
| commit | bc095a27f10047e3620d1e665d29aa7b7a91a584 (patch) | |
| tree | bf268bd7260d59b25179fef073db290f1e28bcf1 | |
| parent | bdf188b2a68992e8e30379d75e367eadebb07e36 (diff) | |
| parent | d3ac4e8083f254a6a0e329a5807c0973f55402f4 (diff) | |
| download | pleroma-bc095a27f10047e3620d1e665d29aa7b7a91a584.tar.gz | |
Merge branch 'fix/oauth-controller' into 'develop'
Fix OAuthController
Closes #1294
See merge request pleroma/pleroma!1780
| -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 |