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

lib/chunks/include.rb

@@ -36,7 +36,8 @@ class Include < WikiChunk::WikiReference
         else
           raise "Unsupported rendering mode #{@mode.inspect}"
         end
-      @content.merge_chunks(included_content)
+      # redirects and categories of included pages should not be inherited
+      @content.merge_chunks(included_content.delete_chunks!([Redirect, Category]))
       clear_include_list
       return included_content.pre_rendered
     else

lib/wiki_content.rb

@@ -185,6 +185,16 @@ class WikiContent < ActiveSupport::SafeBuffer
     end
   end
 
+  def delete_chunks!(types)
+    types.each do |t|
+      @chunks_by_type[t].each do |c|
+        @pre_rendered.sub!(c.mask, '') if @pre_rendered
+        @chunks.delete(c)
+      end
+    end
+    self
+  end
+
   def pre_render!
     unless @pre_rendered
       @chunks_by_type[Include].each{|chunk| chunk.unmask }