pleroma

commit: 9906c6fb6fb0e2ebb36fa91fae94828bcc02ef27
parent: 18a56410b821f1583d216dc55b9bd7b4d3a9c327
Author: rinpatch <rinpatch@sdf.org>
Date:   Thu, 13 Feb 2020 18:08:43 +0000

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
Diffstat:
M
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git 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 =
       [