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

Replace request.request_uri with request.fullpath

Browse source
This commit is contained in:
Tom Hughes 2010-09-03 17:02:13 +01:00
parent 2bc44dfddc
commit 7d45c2fd3c
10 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/application_controller.rb
View file

@ -26,7 +26,7 @@ class ApplicationController < ActionController::Base
if params[:referer]
redirect_to :controller => "user", :action => "terms", :referer => params[:referer]
else
redirect_to :controller => "user", :action => "terms", :referer => request.request_uri
redirect_to :controller => "user", :action => "terms", :referer => request.fullpath
end
end
elsif session[:token]
@ -39,7 +39,7 @@ class ApplicationController < ActionController::Base
end
def require_user
redirect_to :controller => 'user', :action => 'login', :referer => request.request_uri unless @user
redirect_to :controller => 'user', :action => 'login', :referer => request.fullpath unless @user
end
##

4
app/controllers/message_controller.rb
View file

@ -57,7 +57,7 @@ class MessageController < ApplicationController
render :action => 'new'
else
flash[:notice] = t 'message.reply.wrong_user', :user => @user.display_name
redirect_to :controller => "user", :action => "login", :referer => request.request_uri
redirect_to :controller => "user", :action => "login", :referer => request.fullpath
end
rescue ActiveRecord::RecordNotFound
@title = t'message.no_such_message.title'
@ -74,7 +74,7 @@ class MessageController < ApplicationController
@message.save
else
flash[:notice] = t 'message.read.wrong_user', :user => @user.display_name
redirect_to :controller => "user", :action => "login", :referer => request.request_uri
redirect_to :controller => "user", :action => "login", :referer => request.fullpath
end
rescue ActiveRecord::RecordNotFound
@title = t'message.no_such_message.title'

6
app/controllers/user_controller.rb
View file

@ -74,7 +74,7 @@ class UserController < ApplicationController
end
else
# Not logged in, so redirect to the login page
redirect_to :action => :login, :referer => request.request_uri
redirect_to :action => :login, :referer => request.fullpath
end
end
end
@ -671,10 +671,10 @@ private
if params[:display_name]
redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
else
redirect_to :controller => 'user', :action => 'login', :referer => request.request_uri
redirect_to :controller => 'user', :action => 'login', :referer => request.fullpath
end
elsif not @user
redirect_to :controller => 'user', :action => 'login', :referer => request.request_uri
redirect_to :controller => 'user', :action => 'login', :referer => request.fullpath
end
end