Merge branch 'master' into rails_3_1

2011-11-27 21:17:58 +11:00 · 2011-11-27 21:17:58 +11:00 · cecdfa4762
commit cecdfa4762
parent 9f56eecd56 791c5f9d43
1 changed files with 1 additions and 1 deletions
--- a/lib/locomotive/liquid/tags/inherited_block.rb
+++ b/lib/locomotive/liquid/tags/inherited_block.rb
@ -7,7 +7,7 @@ module Locomotive
          super
          
          if !self.contains_super?(@nodelist) # then disable all editable_elements coming from the parent block too and not used
-            @context[:page].disable_parent_editable_elements(@name)
+            @context[:page].disable_parent_editable_elements(@name) unless @context[:page].nil?
          end
        end