cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use configured protocol for URLs in diary feeds

Browse source
This commit is contained in:
Tom Hughes 2018-02-05 22:31:27 +00:00
parent 83d97699cc
commit 2515c77276
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/diary_entry_controller.rb
View file

@ -157,7 +157,7 @@ class DiaryEntryController < ApplicationController
@entries = user.diary_entries
@title = I18n.t("diary_entry.feed.user.title", :user => user.display_name)
@description = I18n.t("diary_entry.feed.user.description", :user => user.display_name)
@link = "http://#{SERVER_URL}/user/#{user.display_name}/diary"
@link = "#{SERVER_PROTOCOL}://#{SERVER_URL}/user/#{user.display_name}/diary"
else
head :not_found
return
@ -169,11 +169,11 @@ class DiaryEntryController < ApplicationController
@entries = @entries.where(:language_code => params[:language])
@title = I18n.t("diary_entry.feed.language.title", :language_name => Language.find(params[:language]).english_name)
@description = I18n.t("diary_entry.feed.language.description", :language_name => Language.find(params[:language]).english_name)
@link = "http://#{SERVER_URL}/diary/#{params[:language]}"
@link = "#{SERVER_PROTOCOL}://#{SERVER_URL}/diary/#{params[:language]}"
else
@title = I18n.t("diary_entry.feed.all.title")
@description = I18n.t("diary_entry.feed.all.description")
@link = "http://#{SERVER_URL}/diary"
@link = "#{SERVER_PROTOCOL}://#{SERVER_URL}/diary"
end
end