diff options
author | rinpatch <rinpatch@sdf.org> | 2020-01-24 11:33:02 +0000 |
---|---|---|
committer | rinpatch <rinpatch@sdf.org> | 2020-01-24 11:33:02 +0000 |
commit | 8533b63d1f75cad58560431aa762ce817f16d77c (patch) | |
tree | 1066b4be29b89cca50877651c68581f53c883ee6 /lib | |
parent | 0fceeb44b3797e2a3c5100edbfd6fdb9e2bf7f28 (diff) | |
parent | 6a0f0ac4a2a4387fd08c723a917216238f5fe8b3 (diff) | |
download | pleroma-8533b63d1f75cad58560431aa762ce817f16d77c.tar.gz |
Merge branch 'fix/1532-fix-for-migration-fe-setting' into 'develop'
Fix for non existing atom
Closes #1532
See merge request pleroma/pleroma!2139
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/config/config_db.ex | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/lib/pleroma/config/config_db.ex b/lib/pleroma/config/config_db.ex index be6688095..119251bee 100644 --- a/lib/pleroma/config/config_db.ex +++ b/lib/pleroma/config/config_db.ex @@ -236,15 +236,7 @@ defmodule Pleroma.ConfigDB do end @spec from_string(String.t()) :: atom() | no_return() - def from_string(":" <> entity), do: String.to_existing_atom(entity) - - def from_string(entity) when is_binary(entity) do - if is_module_name?(entity) do - String.to_existing_atom("Elixir.#{entity}") - else - entity - end - end + def from_string(string), do: do_transform_string(string) @spec convert(any()) :: any() def convert(entity), do: do_convert(entity) |