Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

app/controllers/revision_sweeper.rb

@@ -6,6 +6,12 @@ class RevisionSweeper < ActionController::Caching::Sweeper
   
   observe Revision, Page
   
+  def before_save(record)
+    if record.is_a?(Revision) 
+      expire_cached_revisions(record.page)
+    end
+  end
+  
   def after_save(record)
     if record.is_a?(Revision)
       expire_caches(record.page)

app/controllers/wiki_controller.rb

@@ -250,7 +250,11 @@ class WikiController < ApplicationController
 
   def rollback
     get_page_and_revision
-    @page.lock(Time.now, @author)
+    if @page.locked?(Time.now) and not params['break_lock']
+      redirect_to :web => @web_name, :action => 'locked', :id => @page_name
+    else
+      @page.lock(Time.now, @author)
+    end
   end
 
   def save