aristath / kirki

modules/css/class-kirki-output.php

Spacing +11 added lines, -11 removed lines

@@ -101,12 +101,12 @@ 
 				$value = str_replace( '$', $value, $output['value_pattern'] );
 			}
 			if ( is_array( $value ) ) {
-				if ( isset( $output['choice'] ) && isset( $value[ $output['choice'] ] ) ) {
-					$value[ $output['choice'] ] = str_replace( '$', $value[ $output['choice'] ], $output['value_pattern'] );
+				if ( isset( $output['choice'] ) && isset( $value[$output['choice']] ) ) {
+					$value[$output['choice']] = str_replace( '$', $value[$output['choice']], $output['value_pattern'] );
 				} else {
 					foreach ( array_keys( $value ) as $value_k ) {
-						if ( is_string( $value[ $value_k ] ) ) {
-							$value[ $value_k ] = str_replace( '$', $value[ $value_k ], $output['value_pattern'] );
+						if ( is_string( $value[$value_k] ) ) {
+							$value[$value_k] = str_replace( '$', $value[$value_k], $output['value_pattern'] );
 						}
 					}
 				}
@@ -117,7 +117,7 @@ 
 					$replacement = ( false === $replacement || null === $replacement ) ? '' : $replacement;
 					if ( is_array( $value ) ) {
 						foreach ( $value as $k => $v ) {
-							$value[ $k ] = str_replace( $search, $replacement, $value[ $v ] );
+							$value[$k] = str_replace( $search, $replacement, $value[$v] );
 						}
 						return $value;
 					}
@@ -162,7 +162,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'] ] ) {
+						if ( isset( $output['choice'] ) && isset( $value[$output['choice']] ) && $exclude == $value[$output['choice']] ) {
 							$skip = true;
 						}
 					}
@@ -220,13 +220,13 @@ 
 			'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 ( 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;
 		}
-		$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'];
 	}
 
 	/**
@@ -246,7 +246,7 @@ 
 			'background-position' => 'Kirki_Output_Property_Background_Position',
 		) );
 		if ( array_key_exists( $property, $properties ) ) {
-			$classname = $properties[ $property ];
+			$classname = $properties[$property];
 			$obj = new $classname( $property, $value );
 			return $obj->get_value();
 		}

core/class-kirki-values.php

Spacing +17 added lines, -17 removed lines

@@ -43,14 +43,14 @@ 
 		$config_id = ( '' === $config_id ) ? 'global' : $config_id;
 
 		// Fallback to 'global' if $config_id is not found.
-		if ( ! isset( Kirki::$config[ $config_id ] ) ) {
+		if ( ! isset( Kirki::$config[$config_id] ) ) {
 			$config_id = 'global';
 		}
 
-		switch ( Kirki::$config[ $config_id ]['option_type'] ) {
+		switch ( Kirki::$config[$config_id]['option_type'] ) {
 			case 'option':
 			case 'site_option':
-				$site_option = (bool) ( 'site_option' === Kirki::$config[ $config_id ] );
+				$site_option = (bool) ( 'site_option' === Kirki::$config[$config_id] );
 				return apply_filters( 'kirki/values/get_value', $this->get_from_option( $config_id, $field_id, $site_option ), $field_id );
 			case 'user_meta':
 				$user_id = get_current_user_id();
@@ -73,8 +73,8 @@ 
 	private static function get_from_theme_mod( $field_id ) {
 		// 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'];
 		}
 		return get_theme_mod( $field_id, $default_value );
 	}
@@ -92,29 +92,29 @@ 
 	 */
 	private static function get_from_option( $config_id, $field_id, $site_option = false ) {
 		$get_option = ( $site_option ) ? 'get_site_option' : 'get_option';
-		if ( '' !== Kirki::$config[ $config_id ]['option_name'] ) {
+		if ( '' !== Kirki::$config[$config_id]['option_name'] ) {
 
-			if ( false !== strpos( $field_id, Kirki::$config[ $config_id ]['option_name'] . '[' ) ) {
-				$field_id = str_replace( array( Kirki::$config[ $config_id ]['option_name'], '[', ']' ), '', $field_id );
+			if ( false !== strpos( $field_id, Kirki::$config[$config_id]['option_name'] . '[' ) ) {
+				$field_id = str_replace( array( Kirki::$config[$config_id]['option_name'], '[', ']' ), '', $field_id );
 			}
 
 			// 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'] : '';
-			$value = ( isset( $options[ $setting_modified ] ) ) ? $options[ $setting_modified ] : $default_value;
+			$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.
-		return $get_option( $field_id, Kirki::$fields[ $field_id ]['default'] );
+		return $get_option( $field_id, Kirki::$fields[$field_id]['default'] );
 	}
 
 	/**
@@ -133,8 +133,8 @@ 
 			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 ];
+				if ( isset( $all_values[$sub_setting_id] ) ) {
+					$value = $all_values[$sub_setting_id];
 				}
 			} else {
 				$value = get_option( $field['settings'], $field['default'] );