summaryrefslogtreecommitdiffstats
path: root/app/controllers/application_controller.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2014-04-05 08:11:28 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2014-04-05 08:11:28 +0000
commit380b0515d11a3450c475ce7f2bbed2bd073d0df5 (patch)
treeccaa0da3dbf5bfc619ee521059a330016820933d /app/controllers/application_controller.rb
parente739628c8112f2835bef151ef788e0daf2848ccf (diff)
downloadredmine-380b0515d11a3450c475ce7f2bbed2bd073d0df5.tar.gz
redmine-380b0515d11a3450c475ce7f2bbed2bd073d0df5.zip
Fixed that back_url=/ param is ignored (#16467).
git-svn-id: http://svn.redmine.org/redmine/trunk@13040 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r--app/controllers/application_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 1e251c2a4..5e5b297c2 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -379,7 +379,7 @@ class ApplicationController < ActionController::Base
begin
uri = URI.parse(back_url)
# do not redirect user to another host or to the login or register page
- if ((uri.relative? && back_url.match(%r{\A/\w})) || (uri.host == request.host)) && !uri.path.match(%r{/(login|account/register)})
+ if ((uri.relative? && back_url.match(%r{\A/(\w.*)?\z})) || (uri.host == request.host)) && !uri.path.match(%r{/(login|account/register)})
redirect_to(back_url)
return
end