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,39 +58,39 @@ 
 			}
 
 			// 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' ];
 		}
 	}
 }

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

Spacing +6 added lines, -6 removed lines

@@ -23,7 +23,7 @@ 
 	 */
 	protected function process_output( $output, $value ) {
 
-		if ( ! isset( $output['element'] ) || ! isset( $output['property'] ) ) {
+		if ( ! isset( $output[ 'element' ] ) || ! isset( $output[ 'property' ] ) ) {
 			return;
 		}
 		$output = wp_parse_args(
@@ -35,16 +35,16 @@ 
 			)
 		);
 		if ( is_array( $value ) ) {
-			if ( isset( $output['choice'] ) && $output['choice'] ) {
-				$this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = $output['prefix'] . $this->process_property_value( $output['property'], $value[ $output['choice'] ] ) . $output['units'] . $output['suffix'];
+			if ( isset( $output[ 'choice' ] ) && $output[ 'choice' ] ) {
+				$this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ $output[ 'property' ] ] = $output[ 'prefix' ] . $this->process_property_value( $output[ 'property' ], $value[ $output[ 'choice' ] ] ) . $output[ 'units' ] . $output[ 'suffix' ];
 				return;
 			}
-			if ( isset( $value['url'] ) ) {
-				$this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = $output['prefix'] . $this->process_property_value( $output['property'], $value['url'] ) . $output['units'] . $output['suffix'];
+			if ( isset( $value[ 'url' ] ) ) {
+				$this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ $output[ 'property' ] ] = $output[ 'prefix' ] . $this->process_property_value( $output[ 'property' ], $value[ 'url' ] ) . $output[ 'units' ] . $output[ 'suffix' ];
 				return;
 			}
 			return;
 		}
-		$this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = $output['prefix'] . $this->process_property_value( $output['property'], $value ) . $output['units'] . $output['suffix'];
+		$this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ $output[ 'property' ] ] = $output[ 'prefix' ] . $this->process_property_value( $output[ 'property' ], $value ) . $output[ 'units' ] . $output[ 'suffix' ];
 	}
 }

modules/css/class-kirki-output.php

Spacing +30 added lines, -30 removed lines

@@ -83,13 +83,13 @@ 
 	 */
 	protected function apply_sanitize_callback( $output, $value ) {
 
-		if ( isset( $output['sanitize_callback'] ) && null !== $output['sanitize_callback'] ) {
+		if ( isset( $output[ 'sanitize_callback' ] ) && null !== $output[ 'sanitize_callback' ] ) {
 
 			// If the sanitize_callback is invalid, return the value.
-			if ( ! is_callable( $output['sanitize_callback'] ) ) {
+			if ( ! is_callable( $output[ 'sanitize_callback' ] ) ) {
 				return $value;
 			}
-			return call_user_func( $output['sanitize_callback'], $this->value );
+			return call_user_func( $output[ 'sanitize_callback' ], $this->value );
 		}
 
 		return $value;
@@ -105,22 +105,22 @@ 
 	 */
 	protected function apply_value_pattern( $output, $value ) {
 
-		if ( isset( $output['value_pattern'] ) && ! empty( $output['value_pattern'] ) && is_string( $output['value_pattern'] ) ) {
+		if ( isset( $output[ 'value_pattern' ] ) && ! empty( $output[ 'value_pattern' ] ) && is_string( $output[ 'value_pattern' ] ) ) {
 			if ( ! is_array( $value ) ) {
-				$value = str_replace( '$', $value, $output['value_pattern'] );
+				$value = str_replace( '$', $value, $output[ 'value_pattern' ] );
 			}
 			if ( is_array( $value ) ) {
 				foreach ( array_keys( $value ) as $value_k ) {
 					if ( ! is_string( $value[ $value_k ] ) ) {
 						continue;
 					}
-					if ( isset( $output['choice'] ) ) {
-						if ( $output['choice'] === $value_k ) {
-							$value[ $output['choice'] ] = str_replace( '$', $value[ $output['choice'] ], $output['value_pattern'] );
+					if ( isset( $output[ 'choice' ] ) ) {
+						if ( $output[ 'choice' ] === $value_k ) {
+							$value[ $output[ 'choice' ] ] = str_replace( '$', $value[ $output[ 'choice' ] ], $output[ 'value_pattern' ] );
 						}
 						continue;
 					}
-					$value[ $value_k ] = str_replace( '$', $value[ $value_k ], $output['value_pattern'] );
+					$value[ $value_k ] = str_replace( '$', $value[ $value_k ], $output[ 'value_pattern' ] );
 				}
 			}
 			$value = $this->apply_pattern_replace( $output, $value );
@@ -136,14 +136,14 @@ 
 	 * @return string|array
 	 */
 	protected function apply_pattern_replace( $output, $value ) {
-		if ( isset( $output['pattern_replace'] ) && is_array( $output['pattern_replace'] ) ) {
+		if ( isset( $output[ 'pattern_replace' ] ) && is_array( $output[ 'pattern_replace' ] ) ) {
 			$option_type = ( '' !== Kirki::get_config_param( $this->config_id, 'option_type' ) ) ? Kirki::get_config_param( $this->config_id, 'option_type' ) : 'theme_mod';
 			$option_name = Kirki::get_config_param( $this->config_id, 'option_name' );
 			$options     = array();
 			if ( $option_name ) {
 				$options = ( 'site_option' === $option_type ) ? get_site_option( $option_name ) : get_option( $option_name );
 			}
-			foreach ( $output['pattern_replace'] as $search => $replace ) {
+			foreach ( $output[ 'pattern_replace' ] as $search => $replace ) {
 				$replacement = '';
 				switch ( $option_type ) {
 					case 'option':
@@ -203,8 +203,8 @@ 
 			}
 
 			// No need to proceed this if the current value is the same as in the "exclude" value.
-			if ( isset( $output['exclude'] ) && is_array( $output['exclude'] ) ) {
-				foreach ( $output['exclude'] as $exclude ) {
+			if ( isset( $output[ 'exclude' ] ) && is_array( $output[ 'exclude' ] ) ) {
+				foreach ( $output[ 'exclude' ] as $exclude ) {
 					if ( is_array( $value ) ) {
 						if ( is_array( $exclude ) ) {
 							$diff1 = array_diff( $value, $exclude );
@@ -216,7 +216,7 @@ 
 						}
 						// If 'choice' is defined check for sub-values too.
 						// Fixes https://github.com/aristath/kirki/issues/1416.
-						if ( isset( $output['choice'] ) && isset( $value[ $output['choice'] ] ) && $exclude == $value[ $output['choice'] ] ) { // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
+						if ( isset( $output[ 'choice' ] ) && isset( $value[ $output[ 'choice' ] ] ) && $exclude == $value[ $output[ 'choice' ] ] ) { // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
 							$skip = true;
 						}
 					}
@@ -237,10 +237,10 @@ 
 			// Apply any value patterns defined.
 			$value = $this->apply_value_pattern( $output, $value );
 
-			if ( isset( $output['element'] ) && is_array( $output['element'] ) ) {
-				$output['element'] = array_unique( $output['element'] );
-				sort( $output['element'] );
-				$output['element'] = implode( ',', $output['element'] );
+			if ( isset( $output[ 'element' ] ) && is_array( $output[ 'element' ] ) ) {
+				$output[ 'element' ] = array_unique( $output[ 'element' ] );
+				sort( $output[ 'element' ] );
+				$output[ 'element' ] = implode( ',', $output[ 'element' ] );
 			}
 
 			$value = $this->process_value( $value, $output );
@@ -258,13 +258,13 @@ 
 	 * @return null
 	 */
 	protected function process_output( $output, $value ) {
-		if ( ! isset( $output['element'] ) || ! isset( $output['property'] ) ) {
+		if ( ! isset( $output[ 'element' ] ) || ! isset( $output[ 'property' ] ) ) {
 			return;
 		}
-		$output['media_query'] = ( isset( $output['media_query'] ) ) ? $output['media_query'] : 'global';
-		$output['prefix']      = ( isset( $output['prefix'] ) ) ? $output['prefix'] : '';
-		$output['units']       = ( isset( $output['units'] ) ) ? $output['units'] : '';
-		$output['suffix']      = ( isset( $output['suffix'] ) ) ? $output['suffix'] : '';
+		$output[ 'media_query' ] = ( isset( $output[ 'media_query' ] ) ) ? $output[ 'media_query' ] : 'global';
+		$output[ 'prefix' ]      = ( isset( $output[ 'prefix' ] ) ) ? $output[ 'prefix' ] : '';
+		$output[ 'units' ]       = ( isset( $output[ 'units' ] ) ) ? $output[ 'units' ] : '';
+		$output[ 'suffix' ]      = ( isset( $output[ 'suffix' ] ) ) ? $output[ 'suffix' ] : '';
 
 		// Properties that can accept multiple values.
 		// Useful for example for gradients where all browsers use the "background-image" property
@@ -273,15 +273,15 @@ 
 			'background-image',
 			'background',
 		);
-		if ( in_array( $output['property'], $accepts_multiple, true ) ) {
-			if ( isset( $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] ) && ! is_array( $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] ) ) {
-				$this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = (array) $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ];
+		if ( in_array( $output[ 'property' ], $accepts_multiple, true ) ) {
+			if ( isset( $this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ $output[ 'property' ] ] ) && ! is_array( $this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ $output[ 'property' ] ] ) ) {
+				$this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ $output[ 'property' ] ] = (array) $this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ $output[ 'property' ] ];
 			}
-			$this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ][] = $output['prefix'] . $value . $output['units'] . $output['suffix'];
+			$this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ $output[ 'property' ] ][ ] = $output[ 'prefix' ] . $value . $output[ 'units' ] . $output[ 'suffix' ];
 			return;
 		}
 		if ( is_string( $value ) || is_numeric( $value ) ) {
-			$this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = $output['prefix'] . $this->process_property_value( $output['property'], $value ) . $output['units'] . $output['suffix'];
+			$this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ $output[ 'property' ] ] = $output[ 'prefix' ] . $this->process_property_value( $output[ 'property' ], $value ) . $output[ 'units' ] . $output[ 'suffix' ];
 		}
 	}
 
@@ -320,8 +320,8 @@ 
 	 * @return string|array
 	 */
 	protected function process_value( $value, $output ) {
-		if ( isset( $output['property'] ) ) {
-			return $this->process_property_value( $output['property'], $value );
+		if ( isset( $output[ 'property' ] ) ) {
+			return $this->process_property_value( $output[ 'property' ], $value );
 		}
 		return $value;
 	}

modules/css/class-kirki-modules-css-generator.php

Spacing +6 added lines, -6 removed lines

@@ -146,10 +146,10 @@ 
 	public static function css( $field ) {
 
 		// Set class vars.
-		self::$settings   = $field['settings'];
-		self::$callback   = $field['sanitize_callback'];
-		self::$field_type = $field['type'];
-		self::$output     = $field['output'];
+		self::$settings   = $field[ 'settings' ];
+		self::$callback   = $field[ 'sanitize_callback' ];
+		self::$field_type = $field[ 'type' ];
+		self::$output     = $field[ 'output' ];
 		if ( ! is_array( self::$output ) ) {
 			self::$output = array(
 				array(
@@ -165,7 +165,7 @@ 
 		// Find the class that will handle the outpout for this field.
 		$classname            = 'Kirki_Output';
 		$field_output_classes = apply_filters(
-			"kirki_{$field['kirki_config']}_output_control_classnames", array(
+			"kirki_{$field[ 'kirki_config' ]}_output_control_classnames", array(
 				'kirki-background' => 'Kirki_Output_Field_Background',
 				'kirki-dimensions' => 'Kirki_Output_Field_Dimensions',
 				'kirki-image'      => 'Kirki_Output_Field_Image',
@@ -176,7 +176,7 @@ 
 		if ( array_key_exists( self::$field_type, $field_output_classes ) ) {
 			$classname = $field_output_classes[ self::$field_type ];
 		}
-		$obj = new $classname( $field['kirki_config'], self::$output, self::$value, $field );
+		$obj = new $classname( $field[ 'kirki_config' ], self::$output, self::$value, $field );
 		return $obj->get_styles();
 
 	}

modules/customizer-branding/class-kirki-modules-customizer-branding.php

Spacing +5 added lines, -5 removed lines

@@ -73,14 +73,14 @@
 			'logoImage'   => '',
 			'description' => '',
 		);
-		if ( isset( $config['logo_image'] ) && '' !== $config['logo_image'] ) {
-			$vars['logoImage'] = esc_url_raw( $config['logo_image'] );
+		if ( isset( $config[ 'logo_image' ] ) && '' !== $config[ 'logo_image' ] ) {
+			$vars[ 'logoImage' ] = esc_url_raw( $config[ 'logo_image' ] );
 		}
-		if ( isset( $config['description'] ) && '' !== $config['description'] ) {
-			$vars['description'] = esc_textarea( $config['description'] );
+		if ( isset( $config[ 'description' ] ) && '' !== $config[ 'description' ] ) {
+			$vars[ 'description' ] = esc_textarea( $config[ 'description' ] );
 		}
 
-		if ( ! empty( $vars['logoImage'] ) || ! empty( $vars['description'] ) ) {
+		if ( ! empty( $vars[ 'logoImage' ] ) || ! empty( $vars[ 'description' ] ) ) {
 			wp_register_script( 'kirki-branding', Kirki::$url . '/modules/customizer-branding/branding.js', array(), KIRKI_VERSION, false );
 			wp_localize_script( 'kirki-branding', 'kirkiBranding', $vars );
 			wp_enqueue_script( 'kirki-branding' );

modules/custom-sections/panels/class-kirki-panels-nested-panel.php

Spacing +4 added lines, -4 removed lines

@@ -51,10 +51,10 @@
 			)
 		);
 
-		$array['title']          = html_entity_decode( $this->title, ENT_QUOTES, get_bloginfo( 'charset' ) );
-		$array['content']        = $this->get_content();
-		$array['active']         = $this->active();
-		$array['instanceNumber'] = $this->instance_number;
+		$array[ 'title' ]          = html_entity_decode( $this->title, ENT_QUOTES, get_bloginfo( 'charset' ) );
+		$array[ 'content' ]        = $this->get_content();
+		$array[ 'active' ]         = $this->active();
+		$array[ 'instanceNumber' ] = $this->instance_number;
 
 		return $array;
 	}

modules/custom-sections/sections/class-kirki-sections-nested-section.php

Spacing +6 added lines, -6 removed lines

@@ -53,15 +53,15 @@
 			)
 		);
 
-		$array['title']          = html_entity_decode( $this->title, ENT_QUOTES, get_bloginfo( 'charset' ) );
-		$array['content']        = $this->get_content();
-		$array['active']         = $this->active();
-		$array['instanceNumber'] = $this->instance_number;
+		$array[ 'title' ]          = html_entity_decode( $this->title, ENT_QUOTES, get_bloginfo( 'charset' ) );
+		$array[ 'content' ]        = $this->get_content();
+		$array[ 'active' ]         = $this->active();
+		$array[ 'instanceNumber' ] = $this->instance_number;
 
-		$array['customizeAction'] = esc_attr__( 'Customizing', 'kirki' );
+		$array[ 'customizeAction' ] = esc_attr__( 'Customizing', 'kirki' );
 		if ( $this->panel ) {
 			/* translators: The title. */
-			$array['customizeAction'] = sprintf( esc_attr__( 'Customizing ▸ %s', 'kirki' ), esc_html( $this->manager->get_panel( $this->panel )->title ) );
+			$array[ 'customizeAction' ] = sprintf( esc_attr__( 'Customizing ▸ %s', 'kirki' ), esc_html( $this->manager->get_panel( $this->panel )->title ) );
 		}
 		return $array;
 	}

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 );
 
 		}
@@ -135,18 +135,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' ] );
 			}
 		}
 

core/class-kirki-l10n.php

Spacing +1 added lines, -1 removed lines

@@ -118,7 +118,7 @@
 
 		global $l10n;
 		if ( isset( $l10n[ $this->get_theme_textdomain() ] ) ) {
-			$l10n['kirki'] = $l10n[ $this->get_theme_textdomain() ]; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.OverrideProhibited
+			$l10n[ 'kirki' ] = $l10n[ $this->get_theme_textdomain() ]; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.OverrideProhibited
 		}
 
 		// Check if the domain is "kirki".