diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-12-10 19:55:32 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-12-10 19:55:32 +0000 |
| commit | 37bd32e58b4c7b5005b05138d6bbe832dd171095 (patch) | |
| tree | 0aaa1bee7665efe929ec63d247e74898c67efa30 /lib | |
| parent | 0863ec27379a09ee8367fe61da9e63c90cfe18ee (diff) | |
| parent | d6bf06ab4fb493d5e240092988fe37f2d6a655a3 (diff) | |
| download | pleroma-37bd32e58b4c7b5005b05138d6bbe832dd171095.tar.gz | |
Merge branch '2018-12-10-update-frontend' into 'develop'
2018 12 10 update frontend
See merge request pleroma/pleroma!534
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/user.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index dc67f29c6..bcc34b38f 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -807,8 +807,8 @@ defmodule Pleroma.User do end def parse_bio(bio, user \\ %User{info: %{source_data: %{}}}) - def parse_bio(nil, user), do: "" - def parse_bio(bio, user) when bio == "", do: bio + def parse_bio(nil, _user), do: "" + def parse_bio(bio, _user) when bio == "", do: bio def parse_bio(bio, user) do mentions = Formatter.parse_mentions(bio) |