Make encodings work with Erubis and 1.9 again

rails · Oct 17, 2009 · 7e9e370 · 7e9e370
1 parent a223942
commit 7e9e370
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/actionpack/lib/action_view/template/handlers/erb.rb b/actionpack/lib/action_view/template/handlers/erb.rb
@@ -42,9 +42,11 @@ class ERB < TemplateHandler
       self.erubis_implementation = Erubis
 
       def compile(template)
-        magic = $1 if template.source =~ /\A(<%#.*coding[:=]\s*(\S+)\s*-?%>)/
+        source = template.source.gsub(/\A(<%(#.*coding[:=]\s*(\S+)\s*)-?%>)\s*\n?/, '')
-        erb = "#{magic}<% __in_erb_template=true %>#{template.source}"
+        erb = "<% __in_erb_template=true %>#{source}"
-        self.class.erubis_implementation.new(erb, :trim=>(self.class.erb_trim_mode == "-")).src
+        result = self.class.erubis_implementation.new(erb, :trim=>(self.class.erb_trim_mode == "-")).src
+        result = "#{$2}\n#{result}" if $2
+        result
       end
     end
   end