From 9b5dae7af5757769c1e69d74a59ff036adc1f30f Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Tue, 2 Feb 2010 01:04:35 +0100
Subject: update html_safe calls in guides generation

---
 railties/guides/rails_guides/generator.rb | 14 ++++----------
 railties/guides/source/layout.html.erb    |  2 +-
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/railties/guides/rails_guides/generator.rb b/railties/guides/rails_guides/generator.rb
index bd25111405..6a41bde9f6 100644
--- a/railties/guides/rails_guides/generator.rb
+++ b/railties/guides/rails_guides/generator.rb
@@ -1,11 +1,5 @@
 require 'set'
 
-class String
-  def html_safe!
-    self
-  end unless "post 9415935902f120a9bac0bfce7129725a0db38ed3".respond_to?(:html_safe!)
-end
-
 module RailsGuides
   class Generator
     attr_reader :output, :view_path, :view, :guides_dir
@@ -61,7 +55,7 @@ module RailsGuides
           body = set_header_section(body, @view)
           body = set_index(body, @view)
 
-          result = view.render(:layout => 'layout', :text => textile(body).html_safe!)
+          result = view.render(:layout => 'layout', :text => textile(body).html_safe)
           f.write result
           warn_about_broken_links(result) if ENV.key?("WARN_BROKEN_LINKS")
         end
@@ -77,8 +71,8 @@ module RailsGuides
 
       header = textile(header)
 
-      view.content_for(:page_title) { page_title.html_safe! }
-      view.content_for(:header_section) { header.html_safe! }
+      view.content_for(:page_title) { page_title.html_safe }
+      view.content_for(:header_section) { header.html_safe }
       new_body
     end
 
@@ -109,7 +103,7 @@ module RailsGuides
       index << '</ol>'
       index << '</div>'
 
-      view.content_for(:index_section) { index.html_safe! }
+      view.content_for(:index_section) { index.html_safe }
 
       i.result
     end
diff --git a/railties/guides/source/layout.html.erb b/railties/guides/source/layout.html.erb
index 7dfcf4a507..5f324ece60 100644
--- a/railties/guides/source/layout.html.erb
+++ b/railties/guides/source/layout.html.erb
@@ -87,7 +87,7 @@
   <div id="container">
     <div class="wrapper">
       <div id="mainCol">
-        <%= yield.html_safe! %>
+        <%= yield.html_safe %>
       </div>
     </div>
   </div>
-- 
cgit v1.2.3