nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use AppConfig.url_to for generated urls for oembed

Browse source 
_url doesn't with generate https if the pod uses https
This commit is contained in:
Benjamin Neff 2016-03-10 00:31:06 +01:00 committed by Dennis Schubert
parent 4cb4ee0b5a
commit 67fbd02ae0
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/helpers/posts_helper.rb
View file

@ -20,7 +20,7 @@ module PostsHelper
def post_iframe_url(post_id, opts={})
opts[:width] ||= 516
opts[:height] ||= 315
host = AppConfig.pod_uri.authority
"<iframe src='#{Rails.application.routes.url_helpers.post_url(post_id, :host => host)}' width='#{opts[:width]}px' height='#{opts[:height]}px' frameBorder='0'></iframe>".html_safe
"<iframe src='#{AppConfig.url_to(Rails.application.routes.url_helpers.post_path(post_id))}' " \
"width='#{opts[:width]}px' height='#{opts[:height]}px' frameBorder='0'></iframe>".html_safe
end
end

2
app/presenters/o_embed_presenter.rb
View file

@ -38,7 +38,7 @@ class OEmbedPresenter
end
def post_author_url
Rails.application.routes.url_helpers.person_url(@post.author, :host => AppConfig.pod_uri.host)
AppConfig.url_to(Rails.application.routes.url_helpers.person_path(@post.author))
end
def iframe_html