mirror of
https://github.com/haml/haml.git
synced 2022-11-09 12:33:31 -05:00
[Sass] Fix a Ruby 1.9 compatibility error.
This commit is contained in:
parent
de2f26640e
commit
e907b2c382
2 changed files with 2 additions and 2 deletions
|
@ -42,7 +42,7 @@ module Sass
|
||||||
|
|
||||||
return Functions::EvaluationContext.new(environment.options).send(name, *args)
|
return Functions::EvaluationContext.new(environment.options).send(name, *args)
|
||||||
rescue ArgumentError => e
|
rescue ArgumentError => e
|
||||||
raise e unless e.backtrace.first =~ /:in `(#{name}|perform)'$/
|
raise e unless e.backtrace.first =~ /:in `(block in )?(#{name}|perform)'$/
|
||||||
raise Sass::SyntaxError.new("#{e.message} for `#{name}'")
|
raise Sass::SyntaxError.new("#{e.message} for `#{name}'")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -7,7 +7,7 @@ $:.unshift lib_dir unless $:.include?(lib_dir)
|
||||||
require 'haml'
|
require 'haml'
|
||||||
require 'sass'
|
require 'sass'
|
||||||
|
|
||||||
Sass::RAILS_LOADED = true
|
Sass::RAILS_LOADED = true unless defined?(Sass::RAILS_LOADED)
|
||||||
|
|
||||||
# required because of Sass::Plugin
|
# required because of Sass::Plugin
|
||||||
unless defined? RAILS_ROOT
|
unless defined? RAILS_ROOT
|
||||||
|
|
Loading…
Add table
Reference in a new issue