Merge pull request #17 from Shopify/merge-upstream

Merge upstream

1 files changed, 7 insertions, 2 deletions

diff --git a/lib/oxidized/config/vars.rb b/lib/oxidized/config/vars.rb
index 10f39c3..09f9781 100644
--- a/lib/oxidized/config/vars.rb
+++ b/lib/oxidized/config/vars.rb
@@ -2,9 +2,14 @@ module Oxidized::Config::Vars
   # convenience method for accessing node, group or global level user variables
   # nil values will be ignored
   def vars name
-    r =   @node.vars[name] unless @node.vars.nil?
-    r ||= Oxidized.config.groups[@node.group].vars[name.to_s] if Oxidized.config.groups.has_key?(@node.group)
+    r = @node.vars[name] unless @node.vars.nil?
+    if Oxidized.config.groups.has_key?(@node.group)
+      if Oxidized.config.groups[@node.group].vars.has_key?(name.to_s)
+        r ||= Oxidized.config.groups[@node.group].vars[name.to_s]
+      end
+    end
     r ||= Oxidized.config.vars[name.to_s] if Oxidized.config.vars.has_key?(name.to_s)
     r
   end
 end
+