From 914f57fefcee75d94ec88e466d94edf6d3ac47eb Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 2 Feb 2020 08:38:01 +0000 Subject: Move duplicated back_url method from ApplicationHelper to ApplicationController (#32850). Patch by Holger Just. git-svn-id: http://svn.redmine.org/redmine/trunk@19486 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/application_controller.rb | 6 ++++++ app/helpers/application_helper.rb | 13 ------------- 2 files changed, 6 insertions(+), 13 deletions(-) (limited to 'app') diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 88ba2674e..fd4554f0b 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -417,9 +417,15 @@ class ApplicationController < ActionController::Base url = params[:back_url] if url.nil? && referer = request.env['HTTP_REFERER'] url = CGI.unescape(referer.to_s) + # URLs that contains the utf8=[checkmark] parameter added by Rails are + # parsed as invalid by URI.parse so the redirect to the back URL would + # not be accepted (ApplicationController#validate_back_url would return + # false) + url.gsub!(/(\?|&)utf8=\u2713&?/, '\1') end url end + helper_method :back_url def redirect_back_or_default(default, options={}) back_url = params[:back_url].to_s diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index b76ade5d8..6a7812e4a 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1425,19 +1425,6 @@ module ApplicationHelper arg.to_json.to_s.gsub('/', '\/').html_safe end - def back_url - url = params[:back_url] - if url.nil? && referer = request.env['HTTP_REFERER'] - url = CGI.unescape(referer.to_s) - # URLs that contains the utf8=[checkmark] parameter added by Rails are - # parsed as invalid by URI.parse so the redirect to the back URL would - # not be accepted (ApplicationController#validate_back_url would return - # false) - url.gsub!(/(\?|&)utf8=\u2713&?/, '\1') - end - url - end - def back_url_hidden_field_tag url = back_url hidden_field_tag('back_url', url, :id => nil) unless url.blank? -- cgit v1.2.3