diff options
| author | lambda <pleromagit@rogerbraun.net> | 2019-02-05 11:28:48 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2019-02-05 11:28:48 +0000 |
| commit | 8892f4468c474f169039977b62af1b524a413bf5 (patch) | |
| tree | 95014dfc5712d4cc75ff4b5e3aa670847f47b178 | |
| parent | 03991e7bc5c6309739d8e936ce312a68d9e73b5a (diff) | |
| parent | a2bb5d890d95062e146a4ec6f5923d77ac44a1b9 (diff) | |
| download | pleroma-8892f4468c474f169039977b62af1b524a413bf5.tar.gz pleroma-8892f4468c474f169039977b62af1b524a413bf5.zip | |
Merge branch 'bugfix/rich-media-nil' into 'develop'
html: don't attempt to parse nil content
See merge request pleroma/pleroma!775
| -rw-r--r-- | lib/pleroma/html.ex | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/html.ex b/lib/pleroma/html.ex index bf5daa948..b4a4742ee 100644 --- a/lib/pleroma/html.ex +++ b/lib/pleroma/html.ex @@ -59,6 +59,8 @@ defmodule Pleroma.HTML do end) end + def extract_first_external_url(_, nil), do: {:error, "No content"} + def extract_first_external_url(object, content) do key = "URL|#{object.id}" |