diff options
| author | kaniini <nenolod@gmail.com> | 2019-06-14 15:45:05 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-06-14 15:45:05 +0000 |
| commit | 270f09dbc2cb145e5a06b72189bd1b91dd3d3a02 (patch) | |
| tree | bf75fc306788d784d74fb6ca617f3ddd27b75fd2 /lib/pleroma/user.ex | |
| parent | b7fc722a2e9e93341229cb122aac605421782295 (diff) | |
| parent | c2ca1f22a25d22d6d863406ed05b08c643e5824c (diff) | |
| download | pleroma-270f09dbc2cb145e5a06b72189bd1b91dd3d3a02.tar.gz | |
Merge branch 'feature/905-dynamic-configuration-in-sql' into 'develop'
Feature/905 dynamic configuration in sql
Closes #905
See merge request pleroma/pleroma!1195
Diffstat (limited to 'lib/pleroma/user.ex')
| -rw-r--r-- | lib/pleroma/user.ex | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 9449a88d0..3a9ae8d73 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -1036,9 +1036,7 @@ defmodule Pleroma.User do Pleroma.HTML.Scrubber.TwitterText end - @default_scrubbers Pleroma.Config.get([:markup, :scrub_policy]) - - def html_filter_policy(_), do: @default_scrubbers + def html_filter_policy(_), do: Pleroma.Config.get([:markup, :scrub_policy]) def fetch_by_ap_id(ap_id) do ap_try = ActivityPub.make_user_from_ap_id(ap_id) |