mirror of
https://github.com/haml/haml.git
synced 2022-11-09 12:33:31 -05:00
Merge branch 'stable'
This commit is contained in:
commit
1d036359fe
1 changed files with 2 additions and 2 deletions
|
@ -179,7 +179,7 @@ module Haml
|
||||||
@haml_buffer = buffer
|
@haml_buffer = buffer
|
||||||
end
|
end
|
||||||
|
|
||||||
eval(precompiled + "\n" + precompiled_method_return_value,
|
str = eval(precompiled + ";" + precompiled_method_return_value,
|
||||||
scope, @options[:filename], @options[:line])
|
scope, @options[:filename], @options[:line])
|
||||||
|
|
||||||
# Get rid of the current buffer
|
# Get rid of the current buffer
|
||||||
|
@ -187,7 +187,7 @@ module Haml
|
||||||
@haml_buffer = buffer.upper
|
@haml_buffer = buffer.upper
|
||||||
end
|
end
|
||||||
|
|
||||||
buffer.buffer
|
str
|
||||||
end
|
end
|
||||||
alias_method :to_html, :render
|
alias_method :to_html, :render
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue