diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-04-05 17:39:19 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-04-05 17:39:19 +0000 |
| commit | c6271d836168af455fcc9510907fb4fb330f1d62 (patch) | |
| tree | 8f9e54376e10aace7ab758427a10d28630149caf /lib/redmine | |
| parent | 4e961f44eff23b53351d550fb46c2a346688a271 (diff) | |
| download | redmine-c6271d836168af455fcc9510907fb4fb330f1d62.tar.gz redmine-c6271d836168af455fcc9510907fb4fb330f1d62.zip | |
Fixed: inline image not displayed when including a wiki page (closes #1001).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1327 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine')
| -rw-r--r-- | lib/redmine/wiki_formatting/macros.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/redmine/wiki_formatting/macros.rb b/lib/redmine/wiki_formatting/macros.rb index c0f2b222a..f27ea98b9 100644 --- a/lib/redmine/wiki_formatting/macros.rb +++ b/lib/redmine/wiki_formatting/macros.rb @@ -85,7 +85,7 @@ module Redmine @included_wiki_pages ||= [] raise 'Circular inclusion detected' if @included_wiki_pages.include?(page.title) @included_wiki_pages << page.title - out = textilizable(page.content, :text) + out = textilizable(page.content, :text, :attachments => page.attachments) @included_wiki_pages.pop out else |