aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorraeno <just.raeno@gmail.com>2018-12-10 01:01:43 +0400
committerraeno <just.raeno@gmail.com>2018-12-10 01:01:43 +0400
commit9ba4a1c5fe1cbc6f028f04be9c953a189a08bd09 (patch)
tree01a361aa3ad341219400d3f396e42d9d6edea6cb /lib
parentcf85a9aea1949677a092c0ebc6c0e17475346632 (diff)
downloadpleroma-9ba4a1c5fe1cbc6f028f04be9c953a189a08bd09.tar.gz
Fixes #415. Properly handle nil and empty string by User.parse_bio
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/user.ex6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index a290db04a..5d05dddfa 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -804,7 +804,11 @@ defmodule Pleroma.User do
end
end
- def parse_bio(bio, user \\ %User{info: %{source_data: %{}}}) do
+ 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(bio, user) do
mentions = Formatter.parse_mentions(bio)
tags = Formatter.parse_tags(bio)