Merge branch 'bugfix/959-emoji-loading' into 'develop'
Emoji: Use full path to check if a file is a directory. Closes #959 See merge request pleroma/pleroma!1257
This commit is contained in:
commit
d7f4f65560
@ -98,7 +98,9 @@ defmodule Pleroma.Emoji do
|
||||
Logger.error("Could not access the custom emoji directory #{emoji_dir_path}: #{e}")
|
||||
|
||||
{:ok, results} ->
|
||||
grouped = Enum.group_by(results, &File.dir?/1)
|
||||
grouped =
|
||||
Enum.group_by(results, fn file -> File.dir?(Path.join(emoji_dir_path, file)) end)
|
||||
|
||||
packs = grouped[true] || []
|
||||
files = grouped[false] || []
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user