projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ensure we can't have a null in appends
[akkoma]
/
lib
/
pleroma
/
config_db.ex
diff --git
a/lib/pleroma/config_db.ex
b/lib/pleroma/config_db.ex
index cb57673e39227aefc4ebac6ff979dbbf4b2bb2e1..9e4e6f3ea7ae5b91c4e1e109faef1510a6732e07 100644
(file)
--- a/
lib/pleroma/config_db.ex
+++ b/
lib/pleroma/config_db.ex
@@
-163,7
+163,6
@@
defmodule Pleroma.ConfigDB do
defp only_full_update?(%ConfigDB{group: group, key: key}) do
full_key_update = [
{:pleroma, :ecto_repos},
defp only_full_update?(%ConfigDB{group: group, key: key}) do
full_key_update = [
{:pleroma, :ecto_repos},
- {:quack, :meta},
{:mime, :types},
{:cors_plug, [:max_age, :methods, :expose, :headers]},
{:swarm, :node_blacklist},
{:mime, :types},
{:cors_plug, [:max_age, :methods, :expose, :headers]},
{:swarm, :node_blacklist},
@@
-343,7
+342,11
@@
defmodule Pleroma.ConfigDB do
def string_to_elixir_types(value) do
if module_name?(value) do
def string_to_elixir_types(value) do
if module_name?(value) do
- String.to_existing_atom("Elixir." <> value)
+ try do
+ String.to_existing_atom("Elixir." <> value)
+ rescue
+ ArgumentError -> :invalid_atom
+ end
else
value
end
else
value
end