app/models/setting.rb in fat_free_crm-0.15.0.beta vs app/models/setting.rb in fat_free_crm-0.15.0.beta.2

@@ -54,19 +54,15 @@
       # Return value if cached
       return cache[name] if cache.key?(name)
       # Check database
       if database_and_table_exists?
         if setting = find_by_name(name.to_s)
-          unless setting.value.nil?
-            return cache[name] = setting.value
-          end
+          return cache[name] = setting.value unless setting.value.nil?
         end
       end
       # Check YAML settings
-      if yaml_settings.key?(name)
-        return cache[name] = yaml_settings[name]
-      end
+      return cache[name] = yaml_settings[name] if yaml_settings.key?(name)
     end
 
     # Set setting value
     #-------------------------------------------------------------------
     def []=(name, value)
@@ -87,10 +83,13 @@
 
     def database_and_table_exists?
       # Returns false if table or database is unavailable.
       # Catches all database-related errors, so that Setting will return nil
       # instead of crashing the entire application.
-      table_exists? rescue false
+
+      table_exists?
+    rescue
+      false
     end
 
     # Loads settings from YAML files
     def load_settings_from_yaml(file)
       settings = YAML.load(ERB.new(File.read(file)).result)