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

Merge remote-tracking branch 'upstream/pull/2014'

Browse source
This commit is contained in:
Tom Hughes 2018-10-03 18:59:33 +01:00
commit b8a8a88004
58 changed files with 297 additions and 297 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/messages_controller.rb
View file

@ -54,7 +54,7 @@ class MessagesController < ApplicationController
render :action => "new"
else
flash[:notice] = t ".wrong_user", :user => current_user.display_name
redirect_to :controller => "user", :action => "login", :referer => request.fullpath
redirect_to :controller => "users", :action => "login", :referer => request.fullpath
end
rescue ActiveRecord::RecordNotFound
@title = t "messages.no_such_message.title"
@ -71,7 +71,7 @@ class MessagesController < ApplicationController
@message.save
else
flash[:notice] = t ".wrong_user", :user => current_user.display_name
redirect_to :controller => "user", :action => "login", :referer => request.fullpath
redirect_to :controller => "users", :action => "login", :referer => request.fullpath
end
rescue ActiveRecord::RecordNotFound
@title = t "messages.no_such_message.title"