summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2020-09-07 11:38:15 +0000
committerrinpatch <rinpatch@sdf.org>2020-09-08 14:00:00 +0300
commit4b76d7ce67333fd9e09ce39102c3d5818309009c (patch)
tree96c687da53d7d2a74db4965f5008cd6e4b1b0638
parent9b85592b8bb5b61de6a67d087beecbb651ffb397 (diff)
Merge branch 'fix/admin-controller-atom-leak' into 'develop'
Fix atom leak in AdminAPIController See merge request pleroma/secteam/pleroma!6
-rw-r--r--lib/pleroma/web/admin_api/controllers/admin_api_controller.ex3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex b/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
index aa2af1ab5..f5e4d49f9 100644
--- a/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
+++ b/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
@@ -379,8 +379,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
filters
|> String.split(",")
|> Enum.filter(&Enum.member?(@filters, &1))
- |> Enum.map(&String.to_atom/1)
- |> Map.new(&{&1, true})
+ |> Map.new(&{String.to_existing_atom(&1), true})
end
def right_add_multiple(%{assigns: %{user: admin}} = conn, %{