aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-12-10 19:08:35 +0000
committerlambda <pleromagit@rogerbraun.net>2018-12-10 19:08:35 +0000
commit0863ec27379a09ee8367fe61da9e63c90cfe18ee (patch)
treec740e29d29967c08869668c8987009ff981ce774 /lib
parent8aa646ca31f44c6dc0ad688a6007576be95966e0 (diff)
parent9ba4a1c5fe1cbc6f028f04be9c953a189a08bd09 (diff)
downloadpleroma-0863ec27379a09ee8367fe61da9e63c90cfe18ee.tar.gz
Merge branch 'fix_empty_bio_crash' into 'develop'
Fixes #415. Do not crash during registration when hasn't filled bio field Closes #415 See merge request pleroma/pleroma!529
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 6a267ee58..dc67f29c6 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -806,7 +806,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)