aristath / kirki

modules/css/field/class-kirki-output-field-typography.php

Spacing +17 added lines, -17 removed lines

@@ -23,10 +23,10 @@ 
 	 */
 	protected function process_output( $output, $value ) {
 
-		$output['media_query'] = ( isset( $output['media_query'] ) ) ? $output['media_query'] : 'global';
-		$output['element']     = ( isset( $output['element'] ) ) ? $output['element'] : 'body';
-		$output['prefix']      = ( isset( $output['prefix'] ) ) ? $output['prefix'] : '';
-		$output['suffix']      = ( isset( $output['suffix'] ) ) ? $output['suffix'] : '';
+		$output[ 'media_query' ] = ( isset( $output[ 'media_query' ] ) ) ? $output[ 'media_query' ] : 'global';
+		$output[ 'element' ]     = ( isset( $output[ 'element' ] ) ) ? $output[ 'element' ] : 'body';
+		$output[ 'prefix' ]      = ( isset( $output[ 'prefix' ] ) ) ? $output[ 'prefix' ] : '';
+		$output[ 'suffix' ]      = ( isset( $output[ 'suffix' ] ) ) ? $output[ 'suffix' ] : '';
 
 		$value = Kirki_Field_Typography::sanitize( $value );
 
@@ -48,7 +48,7 @@ 
 		foreach ( $properties as $property ) {
 
 			// Early exit if the value is not in the defaults.
-			if ( ! isset( $this->field['default'][ $property ] ) ) {
+			if ( ! isset( $this->field[ 'default' ][ $property ] ) ) {
 				continue;
 			}
 
@@ -58,37 +58,37 @@ 
 			}
 
 			// Early exit if we use "choice" but not for this property.
-			if ( isset( $output['choice'] ) && $output['choice'] !== $property ) {
+			if ( isset( $output[ 'choice' ] ) && $output[ 'choice' ] !== $property ) {
 				continue;
 			}
 
 			// Take care of variants.
-			if ( 'variant' === $property && isset( $value['variant'] ) && ! empty( $value['variant'] ) ) {
+			if ( 'variant' === $property && isset( $value[ 'variant' ] ) && ! empty( $value[ 'variant' ] ) ) {
 
 				// Get the font_weight.
-				$font_weight = str_replace( 'italic', '', $value['variant'] );
+				$font_weight = str_replace( 'italic', '', $value[ 'variant' ] );
 				$font_weight = ( in_array( $font_weight, array( '', 'regular' ), true ) ) ? '400' : $font_weight;
 
 				// Is this italic?
-				$is_italic = ( false !== strpos( $value['variant'], 'italic' ) );
-				$this->styles[ $output['media_query'] ][ $output['element'] ]['font-weight'] = $font_weight;
+				$is_italic = ( false !== strpos( $value[ 'variant' ], 'italic' ) );
+				$this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ 'font-weight' ] = $font_weight;
 				if ( $is_italic ) {
-					$this->styles[ $output['media_query'] ][ $output['element'] ]['font-style'] = 'italic';
+					$this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ 'font-style' ] = 'italic';
 				}
 				continue;
 			}
 
 			$property_value = $this->process_property_value( $property, $value[ $property ] );
 			if ( 'font-family' === $property ) {
-				$value['font-backup'] = ( isset( $value['font-backup'] ) ) ? $value['font-backup'] : '';
+				$value[ 'font-backup' ] = ( isset( $value[ 'font-backup' ] ) ) ? $value[ 'font-backup' ] : '';
 				$property_value       = $this->process_property_value( $property, array(
-					$value['font-family'],
-					$value['font-backup'],
+					$value[ 'font-family' ],
+					$value[ 'font-backup' ],
 				) );
 			}
-			$property       = ( isset( $output['choice'] ) && isset( $output['property'] ) ) ? $output['property'] : $property;
-			$property_value = ( is_array( $property_value ) && isset( $property_value[0] ) ) ? $property_value[0] : $property_value;
-			$this->styles[ $output['media_query'] ][ $output['element'] ][ $property ] = $output['prefix'] . $property_value . $output['suffix'];
+			$property       = ( isset( $output[ 'choice' ] ) && isset( $output[ 'property' ] ) ) ? $output[ 'property' ] : $property;
+			$property_value = ( is_array( $property_value ) && isset( $property_value[ 0 ] ) ) ? $property_value[ 0 ] : $property_value;
+			$this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ $property ] = $output[ 'prefix' ] . $property_value . $output[ 'suffix' ];
 		}
 	}
 }

field/class-kirki-field-select.php

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
 
 		if ( is_array( $value ) ) {
 			foreach ( $value as $key => $subvalue ) {
-				if ( '' !== $subvalue || isset( $this->choices[''] ) ) {
+				if ( '' !== $subvalue || isset( $this->choices[ '' ] ) ) {
 					$key           = sanitize_key( $key );
 					$value[ $key ] = esc_attr( $subvalue );
 				}

field/class-kirki-field-spacing.php

Spacing +4 added lines, -4 removed lines

@@ -68,10 +68,10 @@
 
 		$default_args = array(
 			'controls' => array(
-				'top'    => ( isset( $this->default['top'] ) ),
-				'bottom' => ( isset( $this->default['top'] ) ),
-				'left'   => ( isset( $this->default['top'] ) ),
-				'right'  => ( isset( $this->default['top'] ) ),
+				'top'    => ( isset( $this->default[ 'top' ] ) ),
+				'bottom' => ( isset( $this->default[ 'top' ] ) ),
+				'left'   => ( isset( $this->default[ 'top' ] ) ),
+				'right'  => ( isset( $this->default[ 'top' ] ) ),
 			),
 			'labels'   => array(
 				'top'    => esc_attr__( 'Top', 'kirki' ),

kirki.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
 		include_once ABSPATH . 'wp-admin/includes/plugin.php';
 	}
 	$data    = get_plugin_data( KIRKI_PLUGIN_FILE );
-	$version = ( isset( $data['Version'] ) ) ? $data['Version'] : false;
+	$version = ( isset( $data[ 'Version' ] ) ) ? $data[ 'Version' ] : false;
 	define( 'KIRKI_VERSION', $version );
 }
 

core/class-kirki-field.php

Spacing +31 added lines, -31 removed lines

@@ -227,28 +227,28 @@ 
 	 */
 	public function __construct( $config_id = 'global', $args = array() ) {
 
-		if ( isset( $args['setting'] ) && ! empty( $args['setting'] ) && ( ! isset( $args['settings'] ) || empty( $args['settings'] ) ) ) {
+		if ( isset( $args[ 'setting' ] ) && ! empty( $args[ 'setting' ] ) && ( ! isset( $args[ 'settings' ] ) || empty( $args[ 'settings' ] ) ) ) {
 			/* translators: %s represents the field ID where the error occurs. */
-			_doing_it_wrong( __METHOD__, sprintf( esc_attr__( 'Typo found in field %s - setting instead of settings.', 'kirki' ), esc_attr( $args['settings'] ) ), '3.0.10' );
-			$args['settings'] = $args['setting'];
-			unset( $args['setting'] );
+			_doing_it_wrong( __METHOD__, sprintf( esc_attr__( 'Typo found in field %s - setting instead of settings.', 'kirki' ), esc_attr( $args[ 'settings' ] ) ), '3.0.10' );
+			$args[ 'settings' ] = $args[ 'setting' ];
+			unset( $args[ 'setting' ] );
 		}
 
 		// In case the user only provides 1 argument,
 		// assume that the provided argument is $args and set $config_id = 'global'.
 		if ( is_array( $config_id ) && empty( $args ) ) {
 			/* translators: %1$s represents the field ID where the error occurs. %2$s is the URL in the documentation site. */
-			_doing_it_wrong( __METHOD__, sprintf( esc_attr__( 'Config not defined for field %1$s - See %2$s for details on how to properly add fields.', 'kirki' ), esc_attr( $args['settings'] ), 'https://aristath.github.io/kirki/docs/getting-started/fields.html' ), '3.0.10' );
+			_doing_it_wrong( __METHOD__, sprintf( esc_attr__( 'Config not defined for field %1$s - See %2$s for details on how to properly add fields.', 'kirki' ), esc_attr( $args[ 'settings' ] ), 'https://aristath.github.io/kirki/docs/getting-started/fields.html' ), '3.0.10' );
 			$args      = $config_id;
 			$config_id = 'global';
 		}
 
-		$args['kirki_config'] = $config_id;
+		$args[ 'kirki_config' ] = $config_id;
 
 		$this->kirki_config = trim( esc_attr( $config_id ) );
 		if ( '' === $config_id ) {
 			/* translators: %1$s represents the field ID where the error occurs. %2$s is the URL in the documentation site. */
-			_doing_it_wrong( __METHOD__, sprintf( esc_attr__( 'Config not defined for field %1$s - See %2$s for details on how to properly add fields.', 'kirki' ), esc_attr( $args['settings'] ), 'https://aristath.github.io/kirki/docs/getting-started/fields.html' ), '3.0.10' );
+			_doing_it_wrong( __METHOD__, sprintf( esc_attr__( 'Config not defined for field %1$s - See %2$s for details on how to properly add fields.', 'kirki' ), esc_attr( $args[ 'settings' ] ), 'https://aristath.github.io/kirki/docs/getting-started/fields.html' ), '3.0.10' );
 			$this->kirki_config = 'global';
 		}
 
@@ -256,7 +256,7 @@ 
 		$defaults = get_class_vars( __CLASS__ );
 
 		// Get the config arguments, and merge them with the defaults.
-		$config_defaults = ( isset( Kirki::$config['global'] ) ) ? Kirki::$config['global'] : array();
+		$config_defaults = ( isset( Kirki::$config[ 'global' ] ) ) ? Kirki::$config[ 'global' ] : array();
 		if ( 'global' !== $this->kirki_config && isset( Kirki::$config[ $this->kirki_config ] ) ) {
 			$config_defaults = Kirki::$config[ $this->kirki_config ];
 		}
@@ -404,7 +404,7 @@ 
 			$this->partial_refresh = array();
 		}
 		foreach ( $this->partial_refresh as $id => $args ) {
-			if ( ! is_array( $args ) || ! isset( $args['selector'] ) || ! isset( $args['render_callback'] ) || ! is_callable( $args['render_callback'] ) ) {
+			if ( ! is_array( $args ) || ! isset( $args[ 'selector' ] ) || ! isset( $args[ 'render_callback' ] ) || ! is_callable( $args[ 'render_callback' ] ) ) {
 				/* translators: %1$s represents the field ID where the error occurs. */
 				_doing_it_wrong( __METHOD__, sprintf( esc_attr__( '"partial_refresh" invalid entry in field %s', 'kirki' ), esc_attr( $this->settings ) ), '3.0.10' );
 				unset( $this->partial_refresh[ $id ] );
@@ -442,8 +442,8 @@ 
 			}
 		}
 		$this->settings = $settings;
-		if ( isset( $this->settings['kirki_placeholder_setting'] ) ) {
-			$this->settings = $this->settings['kirki_placeholder_setting'];
+		if ( isset( $this->settings[ 'kirki_placeholder_setting' ] ) ) {
+			$this->settings = $this->settings[ 'kirki_placeholder_setting' ];
 		}
 	}
 
@@ -457,7 +457,7 @@ 
 	protected function set_active_callback() {
 
 		if ( is_array( $this->active_callback ) && ! is_callable( $this->active_callback ) ) {
-			if ( isset( $this->active_callback[0] ) ) {
+			if ( isset( $this->active_callback[ 0 ] ) ) {
 				$this->required = $this->active_callback;
 			}
 		}
@@ -543,34 +543,34 @@ 
 			);
 		}
 		// Convert to array of arrays if needed.
-		if ( isset( $this->output['element'] ) ) {
+		if ( isset( $this->output[ 'element' ] ) ) {
 			/* translators: The field ID where the error occurs. */
 			_doing_it_wrong( __METHOD__, sprintf( esc_attr__( '"output" invalid format in field %s. The "output" argument should be defined as an array of arrays.', 'kirki' ), esc_attr( $this->settings ) ), '3.0.10' );
 			$this->output = array( $this->output );
 		}
 		foreach ( $this->output as $key => $output ) {
-			if ( empty( $output ) || ! isset( $output['element'] ) ) {
+			if ( empty( $output ) || ! isset( $output[ 'element' ] ) ) {
 				unset( $this->output[ $key ] );
 				continue;
 			}
-			if ( ! isset( $output['sanitize_callback'] ) && isset( $output['callback'] ) ) {
-				$this->output[ $key ]['sanitize_callback'] = $output['callback'];
+			if ( ! isset( $output[ 'sanitize_callback' ] ) && isset( $output[ 'callback' ] ) ) {
+				$this->output[ $key ][ 'sanitize_callback' ] = $output[ 'callback' ];
 			}
 			// Convert element arrays to strings.
-			if ( isset( $output['element'] ) && is_array( $output['element'] ) ) {
-				$this->output[ $key ]['element'] = array_unique( $this->output[ $key ]['element'] );
-				sort( $this->output[ $key ]['element'] );
+			if ( isset( $output[ 'element' ] ) && is_array( $output[ 'element' ] ) ) {
+				$this->output[ $key ][ 'element' ] = array_unique( $this->output[ $key ][ 'element' ] );
+				sort( $this->output[ $key ][ 'element' ] );
 
 				// Trim each element in the array.
-				foreach ( $this->output[ $key ]['element'] as $index => $element ) {
-					$this->output[ $key ]['element'][ $index ] = trim( $element );
+				foreach ( $this->output[ $key ][ 'element' ] as $index => $element ) {
+					$this->output[ $key ][ 'element' ][ $index ] = trim( $element );
 				}
-				$this->output[ $key ]['element'] = implode( ',', $this->output[ $key ]['element'] );
+				$this->output[ $key ][ 'element' ] = implode( ',', $this->output[ $key ][ 'element' ] );
 			}
 
 			// Fix for https://github.com/aristath/kirki/issues/1659#issuecomment-346229751.
-			$this->output[ $key ]['element'] = str_replace( array( "\t", "\n", "\r", "\0", "\x0B" ), ' ', $this->output[ $key ]['element'] );
-			$this->output[ $key ]['element'] = trim( preg_replace( '/\s+/', ' ', $this->output[ $key ]['element'] ) );
+			$this->output[ $key ][ 'element' ] = str_replace( array( "\t", "\n", "\r", "\0", "\x0B" ), ' ', $this->output[ $key ][ 'element' ] );
+			$this->output[ $key ][ 'element' ] = trim( preg_replace( '/\s+/', ' ', $this->output[ $key ][ 'element' ] ) );
 		}
 	}
 
@@ -603,23 +603,23 @@ 
 
 			// Start going through each item in the $output array.
 			foreach ( $this->output as $output ) {
-				$output['function'] = ( isset( $output['function'] ) ) ? $output['function'] : 'style';
+				$output[ 'function' ] = ( isset( $output[ 'function' ] ) ) ? $output[ 'function' ] : 'style';
 
 				// If 'element' or 'property' are not defined, skip this.
-				if ( ! isset( $output['element'] ) || ! isset( $output['property'] ) ) {
+				if ( ! isset( $output[ 'element' ] ) || ! isset( $output[ 'property' ] ) ) {
 					continue;
 				}
-				if ( is_array( $output['element'] ) ) {
-					$output['element'] = implode( ',', $output['element'] );
+				if ( is_array( $output[ 'element' ] ) ) {
+					$output[ 'element' ] = implode( ',', $output[ 'element' ] );
 				}
 
 				// If there's a sanitize_callback defined skip this, unless we also have a js_callback defined.
-				if ( isset( $output['sanitize_callback'] ) && ! empty( $output['sanitize_callback'] ) && ! isset( $output['js_callback'] ) ) {
+				if ( isset( $output[ 'sanitize_callback' ] ) && ! empty( $output[ 'sanitize_callback' ] ) && ! isset( $output[ 'js_callback' ] ) ) {
 					continue;
 				}
 
 				// If we got this far, it's safe to add this.
-				$js_vars[] = $output;
+				$js_vars[ ] = $output;
 			}
 
 			// Did we manage to get all the items from 'output'?
@@ -644,7 +644,7 @@ 
 			$variable        = ( is_string( $this->variables ) && ! empty( $this->variables ) ) ? $this->variables : false;
 			$this->variables = array();
 			if ( $variable && empty( $this->variables ) ) {
-				$this->variables[0]['name'] = $variable;
+				$this->variables[ 0 ][ 'name' ] = $variable;
 			}
 		}
 	}

core/class-kirki-section.php

Spacing +5 added lines, -5 removed lines

@@ -49,16 +49,16 @@
 		// The default class to be used when creating a section.
 		$section_classname = 'WP_Customize_Section';
 
-		if ( isset( $args['type'] ) && array_key_exists( $args['type'], $this->section_types ) ) {
-			$section_classname = $this->section_types[ $args['type'] ];
+		if ( isset( $args[ 'type' ] ) && array_key_exists( $args[ 'type' ], $this->section_types ) ) {
+			$section_classname = $this->section_types[ $args[ 'type' ] ];
 		}
-		if ( isset( $args['type'] ) && 'kirki-outer' === $args['type'] ) {
-			$args['type']      = 'outer';
+		if ( isset( $args[ 'type' ] ) && 'kirki-outer' === $args[ 'type' ] ) {
+			$args[ 'type' ]      = 'outer';
 			$section_classname = 'WP_Customize_Section';
 		}
 
 		// Add the section.
-		$wp_customize->add_section( new $section_classname( $wp_customize, sanitize_key( $args['id'] ), $args ) );
+		$wp_customize->add_section( new $section_classname( $wp_customize, sanitize_key( $args[ 'id' ] ), $args ) );
 
 	}
 }

core/class-kirki-settings.php

Spacing +11 added lines, -11 removed lines

@@ -67,28 +67,28 @@
 
 		// Get the classname we'll be using to create our setting(s).
 		$classname = false;
-		if ( isset( $args['option_type'] ) && array_key_exists( $args['option_type'], $this->setting_types ) ) {
-			$classname = $this->setting_types[ $args['option_type'] ];
+		if ( isset( $args[ 'option_type' ] ) && array_key_exists( $args[ 'option_type' ], $this->setting_types ) ) {
+			$classname = $this->setting_types[ $args[ 'option_type' ] ];
 		}
-		if ( ! isset( $args['type'] ) || ! array_key_exists( $args['type'], $this->setting_types ) ) {
-			$args['type'] = 'default';
+		if ( ! isset( $args[ 'type' ] ) || ! array_key_exists( $args[ 'type' ], $this->setting_types ) ) {
+			$args[ 'type' ] = 'default';
 		}
-		$classname = ! $classname ? $this->setting_types[ $args['type'] ] : $classname;
+		$classname = ! $classname ? $this->setting_types[ $args[ 'type' ] ] : $classname;
 
 		// If settings are defined as an array, then we need to go through them
 		// and call add_setting for each one of them separately.
-		if ( isset( $args['settings'] ) && is_array( $args['settings'] ) ) {
+		if ( isset( $args[ 'settings' ] ) && is_array( $args[ 'settings' ] ) ) {
 
 			// Make sure defaults have been defined.
-			if ( ! isset( $args['default'] ) || ! is_array( $args['default'] ) ) {
-				$args['default'] = array();
+			if ( ! isset( $args[ 'default' ] ) || ! is_array( $args[ 'default' ] ) ) {
+				$args[ 'default' ] = array();
 			}
-			foreach ( $args['settings'] as $key => $value ) {
+			foreach ( $args[ 'settings' ] as $key => $value ) {
 				$default = ( isset( $defaults[ $key ] ) ) ? $defaults[ $key ] : '';
-				$this->add_setting( $classname, $value, $default, $args['option_type'], $args['capability'], $args['transport'], $args['sanitize_callback'] );
+				$this->add_setting( $classname, $value, $default, $args[ 'option_type' ], $args[ 'capability' ], $args[ 'transport' ], $args[ 'sanitize_callback' ] );
 			}
 		}
-		$this->add_setting( $classname, $args['settings'], $args['default'], $args['option_type'], $args['capability'], $args['transport'], $args['sanitize_callback'] );
+		$this->add_setting( $classname, $args[ 'settings' ], $args[ 'default' ], $args[ 'option_type' ], $args[ 'capability' ], $args[ 'transport' ], $args[ 'sanitize_callback' ] );
 	}
 
 	/**

class-kirki-autoload.php

Spacing +8 added lines, -8 removed lines

@@ -89,23 +89,23 @@ 
 		$name_parts = explode( '_', str_replace( 'Kirki_', '', $class_name ) );
 
 		// Handle modules loading.
-		if ( isset( $name_parts[0] ) && 'Modules' === $name_parts[0] ) {
+		if ( isset( $name_parts[ 0 ] ) && 'Modules' === $name_parts[ 0 ] ) {
 			$path    = dirname( __FILE__ ) . '/modules/';
 			$path   .= strtolower( str_replace( '_', '-', str_replace( 'Kirki_Modules_', '', $class_name ) ) ) . '/';
-			$paths[] = $path . $filename;
+			$paths[ ] = $path . $filename;
 		}
 
-		if ( isset( $name_parts[0] ) ) {
+		if ( isset( $name_parts[ 0 ] ) ) {
 
 			// Handle controls loading.
-			if ( 'Control' === $name_parts[0] || 'Settings' === $name_parts[0] ) {
+			if ( 'Control' === $name_parts[ 0 ] || 'Settings' === $name_parts[ 0 ] ) {
 				$path    = dirname( __FILE__ ) . '/controls/php/';
-				$paths[] = $path . $filename;
+				$paths[ ] = $path . $filename;
 			}
 		}
 
-		$paths[] = dirname( __FILE__ ) . '/core/' . $filename;
-		$paths[] = dirname( __FILE__ ) . '/lib/' . $filename;
+		$paths[ ] = dirname( __FILE__ ) . '/core/' . $filename;
+		$paths[ ] = dirname( __FILE__ ) . '/lib/' . $filename;
 
 		$substr   = str_replace( 'Kirki_', '', $class_name );
 		$exploded = explode( '_', $substr );
@@ -113,7 +113,7 @@ 
 
 		$previous_path = '';
 		for ( $i = 0; $i < $levels; $i++ ) {
-			$paths[]        = dirname( __FILE__ ) . '/' . $previous_path . strtolower( $exploded[ $i ] ) . '/' . $filename;
+			$paths[ ]        = dirname( __FILE__ ) . '/' . $previous_path . strtolower( $exploded[ $i ] ) . '/' . $filename;
 			$previous_path .= strtolower( $exploded[ $i ] ) . '/';
 		}
 		return $paths;

core/class-kirki-values.php

Spacing +24 added lines, -24 removed lines

@@ -40,17 +40,17 @@ 
 	 */
 	public function typography_field_tweaks( $value, $field_id ) {
 
-		if ( isset( Kirki::$fields[ $field_id ] ) && isset( Kirki::$fields[ $field_id ]['type'] ) ) {
-			if ( 'kirki-typography' === Kirki::$fields[ $field_id ]['type'] ) {
+		if ( isset( Kirki::$fields[ $field_id ] ) && isset( Kirki::$fields[ $field_id ][ 'type' ] ) ) {
+			if ( 'kirki-typography' === Kirki::$fields[ $field_id ][ 'type' ] ) {
 
 				// Sanitize the value.
 				// This also adds font-weight if it doesn't already exist.
 				$value = Kirki_Field_Typography::sanitize( $value );
 
 				// Combine font-family and font-backup.
-				if ( isset( $value['font-family'] ) && isset( $value['font-backup'] ) ) {
-					$value['font-family'] .= ', ' . $value['font-backup'];
-					unset( $value['font-backup'] );
+				if ( isset( $value[ 'font-family' ] ) && isset( $value[ 'font-backup' ] ) ) {
+					$value[ 'font-family' ] .= ', ' . $value[ 'font-backup' ];
+					unset( $value[ 'font-backup' ] );
 				}
 			}
 		}
@@ -87,39 +87,39 @@ 
 			$config_id = 'global';
 		}
 
-		if ( 'theme_mod' === Kirki::$config[ $config_id ]['option_type'] ) {
+		if ( 'theme_mod' === Kirki::$config[ $config_id ][ 'option_type' ] ) {
 
 			// We're using theme_mods so just get the value using get_theme_mod.
 			$default_value = null;
-			if ( isset( Kirki::$fields[ $field_id ] ) && isset( Kirki::$fields[ $field_id ]['default'] ) ) {
-				$default_value = Kirki::$fields[ $field_id ]['default'];
+			if ( isset( Kirki::$fields[ $field_id ] ) && isset( Kirki::$fields[ $field_id ][ 'default' ] ) ) {
+				$default_value = Kirki::$fields[ $field_id ][ 'default' ];
 			}
 			$value = get_theme_mod( $field_id, $default_value );
 			return apply_filters( 'kirki_values_get_value', $value, $field_id );
 		}
 
-		if ( 'option' === Kirki::$config[ $config_id ]['option_type'] ) {
+		if ( 'option' === Kirki::$config[ $config_id ][ 'option_type' ] ) {
 
 			// We're using options.
-			if ( '' !== Kirki::$config[ $config_id ]['option_name'] ) {
+			if ( '' !== Kirki::$config[ $config_id ][ 'option_name' ] ) {
 
 				// Options are serialized as a single option in the db.
 				// We'll have to get the option and then get the item from the array.
-				$options = get_option( Kirki::$config[ $config_id ]['option_name'] );
+				$options = get_option( Kirki::$config[ $config_id ][ 'option_name' ] );
 
-				if ( ! isset( Kirki::$fields[ $field_id ] ) && isset( Kirki::$fields[ Kirki::$config[ $config_id ]['option_name'] . '[' . $field_id . ']' ] ) ) {
-					$field_id = Kirki::$config[ $config_id ]['option_name'] . '[' . $field_id . ']';
+				if ( ! isset( Kirki::$fields[ $field_id ] ) && isset( Kirki::$fields[ Kirki::$config[ $config_id ][ 'option_name' ] . '[' . $field_id . ']' ] ) ) {
+					$field_id = Kirki::$config[ $config_id ][ 'option_name' ] . '[' . $field_id . ']';
 				}
-				$setting_modified = str_replace( ']', '', str_replace( Kirki::$config[ $config_id ]['option_name'] . '[', '', $field_id ) );
+				$setting_modified = str_replace( ']', '', str_replace( Kirki::$config[ $config_id ][ 'option_name' ] . '[', '', $field_id ) );
 
-				$default_value = ( isset( Kirki::$fields[ $field_id ] ) && isset( Kirki::$fields[ $field_id ]['default'] ) ) ? Kirki::$fields[ $field_id ]['default'] : '';
+				$default_value = ( isset( Kirki::$fields[ $field_id ] ) && isset( Kirki::$fields[ $field_id ][ 'default' ] ) ) ? Kirki::$fields[ $field_id ][ 'default' ] : '';
 				$value         = ( isset( $options[ $setting_modified ] ) ) ? $options[ $setting_modified ] : $default_value;
 				$value         = maybe_unserialize( $value );
 				return apply_filters( 'kirki_values_get_value', $value, $field_id );
 			}
 
 			// Each option separately saved in the db.
-			$value = get_option( $field_id, Kirki::$fields[ $field_id ]['default'] );
+			$value = get_option( $field_id, Kirki::$fields[ $field_id ][ 'default' ] );
 			return apply_filters( 'kirki_values_get_value', $value, $field_id );
 
 		} // End if().
@@ -137,18 +137,18 @@ 
 	 * @return string|array
 	 */
 	public static function get_sanitized_field_value( $field ) {
-		$value = $field['default'];
-		if ( isset( $field['option_type'] ) && 'theme_mod' === $field['option_type'] ) {
-			$value = get_theme_mod( $field['settings'], $field['default'] );
-		} elseif ( isset( $field['option_type'] ) && 'option' === $field['option_type'] ) {
-			if ( isset( $field['option_name'] ) && '' !== $field['option_name'] ) {
-				$all_values     = get_option( $field['option_name'], array() );
-				$sub_setting_id = str_replace( array( ']', $field['option_name'] . '[' ), '', $field['settings'] );
+		$value = $field[ 'default' ];
+		if ( isset( $field[ 'option_type' ] ) && 'theme_mod' === $field[ 'option_type' ] ) {
+			$value = get_theme_mod( $field[ 'settings' ], $field[ 'default' ] );
+		} elseif ( isset( $field[ 'option_type' ] ) && 'option' === $field[ 'option_type' ] ) {
+			if ( isset( $field[ 'option_name' ] ) && '' !== $field[ 'option_name' ] ) {
+				$all_values     = get_option( $field[ 'option_name' ], array() );
+				$sub_setting_id = str_replace( array( ']', $field[ 'option_name' ] . '[' ), '', $field[ 'settings' ] );
 				if ( isset( $all_values[ $sub_setting_id ] ) ) {
 					$value = $all_values[ $sub_setting_id ];
 				}
 			} else {
-				$value = get_option( $field['settings'], $field['default'] );
+				$value = get_option( $field[ 'settings' ], $field[ 'default' ] );
 			}
 		}