deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed chunk mask to handle negative object_id values [Venkat]

Browse source
This commit is contained in:
Alexey Verkhovsky 2005-09-14 02:01:20 +00:00
parent 4c14f07100
commit 4a8d6eefe0
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/chunks/include.rb
View file

@ -30,8 +30,11 @@ class Include < WikiChunk::WikiReference
return "<em>Recursive include detected; #{@page_name} --> #{@content.page_name} " +
"--> #{@page_name}</em>\n"
else
@content.merge_chunks(renderer.display_content)
return renderer.display_content.pre_rendered
require 'breakpoint'
breakpoint
included_content = renderer.display_content
@content.merge_chunks(included_content)
return included_content.pre_rendered
end
else
return "<em>Could not include #{@page_name}</em>\n"