diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-05-08 21:37:55 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-05-08 21:37:55 +0300 |
| commit | b2924ab1fbba4e6add15030cf8444d2d3f0cfe0c (patch) | |
| tree | 000420341c4397cb7e380ff6fa52bb023700476a /lib/pleroma/web/feed/user_controller.ex | |
| parent | d5cdc907e3fda14c2ce78ddbb124739441330ecc (diff) | |
| parent | 570940a3fd8d5a2fb600656432dfc01304161221 (diff) | |
| download | pleroma-b2924ab1fbba4e6add15030cf8444d2d3f0cfe0c.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
Diffstat (limited to 'lib/pleroma/web/feed/user_controller.ex')
| -rw-r--r-- | lib/pleroma/web/feed/user_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/feed/user_controller.ex b/lib/pleroma/web/feed/user_controller.ex index e27f85929..1b72e23dc 100644 --- a/lib/pleroma/web/feed/user_controller.ex +++ b/lib/pleroma/web/feed/user_controller.ex @@ -27,7 +27,7 @@ defmodule Pleroma.Web.Feed.UserController do when format in ["json", "activity+json"] do with %{halted: false} = conn <- Pleroma.Plugs.EnsureAuthenticatedPlug.call(conn, - unless_func: &Pleroma.Web.FederatingPlug.federating?/0 + unless_func: &Pleroma.Web.FederatingPlug.federating?/1 ) do ActivityPubController.call(conn, :user) end |