ThemeSettings: Check keys exist before using them

gamajo · Aug 7, 2017 · c5584ba · c5584ba
1 parent b881912
commit c5584ba
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/ThemeSettings.php b/src/ThemeSettings.php
@@ -101,11 +101,15 @@ class ThemeSettings extends Brick
      */
     public function apply()
     {
-        // Change the theme settings defaults.
-        add_filter('genesis_theme_settings_defaults', [ $this, 'themeSettingsDefaults' ]);
+        if ($this->config->hasKey(self::DEFAULTS)) {
+            // Change the theme settings defaults.
+            add_filter('genesis_theme_settings_defaults', [$this, 'themeSettingsDefaults']);
+        }
 
-        // Force specific values to be returned.
-        $this->forceValues();
+        if ($this->config->hasKey(self::FORCE)) {
+            // Force specific values to be returned.
+            $this->forceValues();
+        }
     }
 
     /**
@@ -118,7 +122,7 @@ public function themeSettingsDefaults($defaults): array
     {
         $defaultsConfig = $this->config->getSubConfig(self::DEFAULTS);
         foreach ($defaultsConfig->getArrayCopy() as $key => $value) {
-            $defaults[ $key ] = $value;
+            $defaults[$key] = $value;
         }
 
         return $defaults;