diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-02-13 18:08:43 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-02-13 18:08:43 +0000 |
| commit | 9906c6fb6fb0e2ebb36fa91fae94828bcc02ef27 (patch) | |
| tree | 6efc7563636868f448f53dbae84e49f2c012ef94 | |
| parent | 18a56410b821f1583d216dc55b9bd7b4d3a9c327 (diff) | |
| parent | 23049a077e8819fcae36cebd336adc5e25eff1e8 (diff) | |
| download | pleroma-9906c6fb6fb0e2ebb36fa91fae94828bcc02ef27.tar.gz | |
Merge branch 'fix/mrf-transparency-disabling-federation-status' into 'develop'
NodeInfo: Fix federating status not being reported when MRF transparency is disabled
Closes #1568
See merge request pleroma/pleroma!2206
| -rw-r--r-- | lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex index 03c35cc2a..333012920 100644 --- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex +++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex @@ -46,10 +46,10 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do data |> Map.merge(%{quarantined_instances: quarantined}) - |> Map.put(:enabled, Config.get([:instance, :federating])) else %{} end + |> Map.put(:enabled, Config.get([:instance, :federating])) features = [ |