diff options
| author | lain <lain@soykaf.club> | 2019-06-14 11:52:04 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-06-14 11:52:04 +0000 |
| commit | 7f48b90bfb8410606e4d733af8b212bea8534db2 (patch) | |
| tree | 138c47b17307cdd722de3e4fda95cd16c4c4dab5 /lib | |
| parent | a971b357855dd2eac019a8ee91c1c79864cbcf77 (diff) | |
| parent | d0ebc0edf31945181a941dca891fce7b3d5637ab (diff) | |
| download | pleroma-7f48b90bfb8410606e4d733af8b212bea8534db2.tar.gz pleroma-7f48b90bfb8410606e4d733af8b212bea8534db2.zip | |
Merge branch 'fix/hashtag-rich-media' into 'develop'
Fix hashtags being picked up by rich media parser
Closes #989
See merge request pleroma/pleroma!1288
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/html.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/html.ex b/lib/pleroma/html.ex index e5e78ee4f..8c226c944 100644 --- a/lib/pleroma/html.ex +++ b/lib/pleroma/html.ex @@ -89,7 +89,7 @@ defmodule Pleroma.HTML do Cachex.fetch!(:scrubber_cache, key, fn _key -> result = content - |> Floki.filter_out("a.mention") + |> Floki.filter_out("a.mention,a.hashtag") |> Floki.attribute("a", "href") |> Enum.at(0) |