From 0fc6418e75626bbbd2a696bd3e354bae583d65ed Mon Sep 17 00:00:00 2001 From: Ryan Bigg Date: Sat, 16 Jan 2010 23:23:54 +0530 Subject: Mark title and headers as html_safe! for guides [#3702 state:resolved] Signed-off-by: Pratik Naik --- railties/guides/rails_guides/generator.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'railties/guides/rails_guides/generator.rb') diff --git a/railties/guides/rails_guides/generator.rb b/railties/guides/rails_guides/generator.rb index 2a4714b13a..cebf6ae866 100644 --- a/railties/guides/rails_guides/generator.rb +++ b/railties/guides/rails_guides/generator.rb @@ -71,8 +71,8 @@ module RailsGuides header = textile(header) - view.content_for(:page_title) { page_title } - view.content_for(:header_section) { header } + view.content_for(:page_title) { page_title.html_safe! } + view.content_for(:header_section) { header.html_safe! } new_body end @@ -103,7 +103,7 @@ module RailsGuides index << '' index << '' - view.content_for(:index_section) { index } + view.content_for(:index_section) { index.html_safe! } i.result end -- cgit v1.2.3 From e17b23db016c03801ade2666793b4a51583f3785 Mon Sep 17 00:00:00 2001 From: Ryan Bigg Date: Sat, 16 Jan 2010 10:42:04 +1000 Subject: Make guides generation work for Ruby 1.9.x Signed-off-by: Pratik Naik --- railties/guides/rails_guides/generator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/guides/rails_guides/generator.rb') diff --git a/railties/guides/rails_guides/generator.rb b/railties/guides/rails_guides/generator.rb index cebf6ae866..e3df3be882 100644 --- a/railties/guides/rails_guides/generator.rb +++ b/railties/guides/rails_guides/generator.rb @@ -95,7 +95,7 @@ module RailsGuides view.content_tag(:li, l) end - children_ul = view.content_tag(:ul, children) + children_ul = view.content_tag(:ul, children.join(" ")) index << view.content_tag(:li, link + children_ul) end -- cgit v1.2.3