summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2008-09-13 18:45:56 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2008-09-13 18:45:56 +0000
commit570d7e494ee47799dc0727c1c29a71cfa918582a (patch)
treea8269d3ff43e1d9ebdcf34caaccf232205168cc3 /app
parent1f1fd9e034a83ac6ffdd3e8cbda86b92a9326d8b (diff)
downloadredmine-570d7e494ee47799dc0727c1c29a71cfa918582a.tar.gz
redmine-570d7e494ee47799dc0727c1c29a71cfa918582a.zip
Fixed: unable to revert to a previous wiki page version.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1821 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/controllers/wiki_controller.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 5c8158db8..114010dff 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -66,7 +66,10 @@ class WikiController < ApplicationController
@content.text = "h1. #{@page.pretty_title}" if @content.text.blank?
# don't keep previous comment
@content.comments = nil
- if request.post?
+ if request.get?
+ # To prevent StaleObjectError exception when reverting to a previous version
+ @content.version = @page.content.version
+ else
if !@page.new_record? && @content.text == params[:content][:text]
# don't save if text wasn't changed
redirect_to :action => 'index', :id => @project, :page => @page.title