From 2515c77276ef7a735b1f6c719789f72205d08214 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 5 Feb 2018 22:31:27 +0000 Subject: [PATCH] Use configured protocol for URLs in diary feeds --- app/controllers/diary_entry_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb index 6eb662bd8..5bd95775d 100644 --- a/app/controllers/diary_entry_controller.rb +++ b/app/controllers/diary_entry_controller.rb @@ -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 -- 2.43.2