Merge pull request #1205 from EventideSystems/fix_setting_check

Safer setting check

app/models/setting.rb

@@ -58,9 +58,9 @@ def [](name)
       return cache[name] if cache.key?(name)
 
       # Check database
-      if database_and_table_exists? && setting = find_by_name(name.to_s) && !setting.value.nil?
+      if database_and_table_exists? && (setting = find_by_name(name.to_s))&.value.present?
         return cache[name] = setting.value
-        end
+      end
       # Check YAML settings
       return cache[name] = yaml_settings[name] if yaml_settings.key?(name)
     end

spec/models/setting_spec.rb

@@ -54,6 +54,11 @@
     expect(Setting.hello).to eq(false)
   end
 
+  it "should return nil if setting is missing and no default value is provided by YAML" do
+    expect(Setting[:missing]).to eq(nil)
+    expect(Setting.missing).to eq(nil)
+  end
+
   describe "#dig" do
     it "should dig into nested hashes" do
       Setting[:hello] = { foo: { bar: 3 } }