diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-03-21 16:55:28 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-03-21 16:55:28 +0000 |
| commit | 3d551f97e14e772550ca15bfb169645245b8d4e6 (patch) | |
| tree | 95e00ca311ccf8be1af3fb8aaa5a6d9a78447a3a /app | |
| parent | 3acae2529ef032b07d319f08ff0f990aa7759840 (diff) | |
| download | redmine-3d551f97e14e772550ca15bfb169645245b8d4e6.tar.gz redmine-3d551f97e14e772550ca15bfb169645245b8d4e6.zip | |
Fixed: Simultaneous wiki updates cause internal error (#7939).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5185 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/wiki_controller.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb index f3a9b90ad..5b87f902a 100644 --- a/app/controllers/wiki_controller.rb +++ b/app/controllers/wiki_controller.rb @@ -100,9 +100,6 @@ class WikiController < ApplicationController # To prevent StaleObjectError exception when reverting to a previous version @content.version = @page.content.version - rescue ActiveRecord::StaleObjectError - # Optimistic locking exception - flash[:error] = l(:notice_locking_conflict) end verify :method => :put, :only => :update, :render => {:nothing => true, :status => :method_not_allowed } @@ -138,7 +135,8 @@ class WikiController < ApplicationController rescue ActiveRecord::StaleObjectError # Optimistic locking exception - flash[:error] = l(:notice_locking_conflict) + flash.now[:error] = l(:notice_locking_conflict) + render :action => 'edit' end # rename a page |