diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-10-06 14:59:58 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-10-06 14:59:58 +0000 |
| commit | 10f4ce848a7a4edd4d420642f1ad9e7fca009f85 (patch) | |
| tree | b23321bccbcd7e7686a593d46e62036cd39173fe /lib | |
| parent | 294e08cb65940ff193d6920e576f56718a5623f4 (diff) | |
| parent | 2a2d834ff75fc9d2e89ffda392d49f0ad29c45c1 (diff) | |
| download | pleroma-10f4ce848a7a4edd4d420642f1ad9e7fca009f85.tar.gz pleroma-10f4ce848a7a4edd4d420642f1ad9e7fca009f85.zip | |
Merge branch 'backport/fix-report-email' into 'maint/1.1'
backport: Use the user.id instead of nickname in report URLs
See merge request pleroma/pleroma!1802
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/emails/admin_email.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/emails/admin_email.ex b/lib/pleroma/emails/admin_email.ex index c14be02dd..5a0903c13 100644 --- a/lib/pleroma/emails/admin_email.ex +++ b/lib/pleroma/emails/admin_email.ex @@ -17,7 +17,7 @@ defmodule Pleroma.Emails.AdminEmail do end defp user_url(user) do - Helpers.o_status_url(Pleroma.Web.Endpoint, :feed_redirect, user.nickname) + Helpers.o_status_url(Pleroma.Web.Endpoint, :feed_redirect, user.id) end def report(to, reporter, account, statuses, comment) do |