From 13f065cfd7cf02dee48373445cccfff3b778aa8e Mon Sep 17 00:00:00 2001 From: Nathan Weizenbaum Date: Mon, 11 Oct 2010 20:29:07 -0700 Subject: [PATCH] Don't load the Rails 2 shim under Rails 3. Closes gh-299 --- lib/haml.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/haml.rb b/lib/haml.rb index 35b96ade..56244307 100644 --- a/lib/haml.rb +++ b/lib/haml.rb @@ -25,9 +25,10 @@ module Haml # This isn't actually used; # it's just passed in in case it needs to be used in the future def self.init_rails(binding) - # Rails 2.2+ + # 2.2 <= Rails < 3 if defined?(Rails) && Rails.respond_to?(:configuration) && - Rails.configuration.respond_to?(:after_initialize) + Rails.configuration.respond_to?(:after_initialize) && + !Haml::Util.ap_geq_3? Rails.configuration.after_initialize do next if defined?(Sass) autoload(:Sass, 'sass/rails2_shim')