aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorhref <href@random.sh>2018-11-05 21:16:56 +0100
committerhref <href@random.sh>2018-11-05 21:17:47 +0100
commit83911b1443c99d3f8c6784a57d8327a22c05e606 (patch)
tree044df83f0f9d3dbee4c2df7287d1e3b347e268d8 /lib
parent03702e4c4a3f7ca80d6adcdcd77b39e6a60809c6 (diff)
downloadpleroma-83911b1443c99d3f8c6784a57d8327a22c05e606.tar.gz
Fix wrong return when finmoji is disabled
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/emoji.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/emoji.ex b/lib/pleroma/emoji.ex
index 7da1a2438..0a5e1d5ce 100644
--- a/lib/pleroma/emoji.ex
+++ b/lib/pleroma/emoji.ex
@@ -153,7 +153,7 @@ defmodule Pleroma.Emoji do
end)
end
- defp load_finmoji(_), do: :ok
+ defp load_finmoji(_), do: []
defp load_from_file(file) do
if File.exists?(file) do