tenderlove (owner)

Revisions

gist: 192926 Download_button fork
public
Public Clone URL: git://gist.github.com/192926.git
Embed All Files: show embed
Diff #
raw 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27

diff --git a/activesupport/lib/active_support/concern.rb b/activesupport/lib/active_support/concern.rb
index dcf1e81..79d4f84 100644
--- a/activesupport/lib/active_support/concern.rb
+++ b/activesupport/lib/active_support/concern.rb
@@ -4,17 +4,19 @@ module ActiveSupport
   module Concern
     include DependencyModule
 
+    @@_included_block = nil
+
     def append_features(base)
       if super
         base.extend const_get("ClassMethods") if const_defined?("ClassMethods")
         base.send :include, const_get("InstanceMethods") if const_defined?("InstanceMethods")
-        base.class_eval(&@_included_block) if instance_variable_defined?("@_included_block")
+        base.class_eval(&@@_included_block) if @@_included_block
       end
     end
 
     def included(base = nil, &block)
       if base.nil?
-        @_included_block = block
+        @@_included_block = block
       else
         super
       end