aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/oauth/fallback_controller.ex
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-05-01 18:40:41 +0200
committerlain <lain@soykaf.club>2019-05-01 18:40:41 +0200
commit45f790becc2cc63ac000c6432fe8c84e0b589822 (patch)
tree724d0e8ce5f10807cc25efc2434454bf38c5a52c /lib/pleroma/web/oauth/fallback_controller.ex
parent4908e0eeee2ecb58b204198c20720d52548b6f4a (diff)
parentd107919b3d8b2275ddb7b17846cab182682098a7 (diff)
downloadpleroma-45f790becc2cc63ac000c6432fe8c84e0b589822.tar.gz
Merge remote-tracking branch 'origin/develop' into conversations_three
Diffstat (limited to 'lib/pleroma/web/oauth/fallback_controller.ex')
-rw-r--r--lib/pleroma/web/oauth/fallback_controller.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/oauth/fallback_controller.ex b/lib/pleroma/web/oauth/fallback_controller.ex
index afaa00242..e3984f009 100644
--- a/lib/pleroma/web/oauth/fallback_controller.ex
+++ b/lib/pleroma/web/oauth/fallback_controller.ex
@@ -24,6 +24,6 @@ defmodule Pleroma.Web.OAuth.FallbackController do
conn
|> put_status(:unauthorized)
|> put_flash(:error, "Invalid Username/Password")
- |> OAuthController.authorize(conn.params["authorization"])
+ |> OAuthController.authorize(conn.params)
end
end