logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: d567a382e30b6d6f2b32dc249380e24b8d5f2be7
parent: 18fe77084f8695efce4f2b94917af0a34d3ef5b0
Author: ThibG <thib@sitedethib.com>
Date:   Fri,  2 Jun 2017 22:21:36 +0200

Ensure well_known controllers use WEB_DOMAIN by including RoutingHelper (#2388)

This fixes #2375.

Diffstat:

Mapp/controllers/well_known/host_meta_controller.rb2++
Mapp/controllers/well_known/webfinger_controller.rb2++
2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/app/controllers/well_known/host_meta_controller.rb b/app/controllers/well_known/host_meta_controller.rb @@ -2,6 +2,8 @@ module WellKnown class HostMetaController < ApplicationController + include RoutingHelper + def show @webfinger_template = "#{webfinger_url}?resource={uri}" diff --git a/app/controllers/well_known/webfinger_controller.rb b/app/controllers/well_known/webfinger_controller.rb @@ -2,6 +2,8 @@ module WellKnown class WebfingerController < ApplicationController + include RoutingHelper + def show @account = Account.find_local!(username_from_resource) @canonical_account_uri = @account.to_webfinger_s