|
@@ -257,13 +257,13 @@ discard block |
|
|
block discarded – undo |
|
257
|
257
|
|
|
258
|
258
|
// Get the config arguments, and merge them with the defaults. |
|
259
|
259
|
$config_defaults = ( isset( Kirki::$config['global'] ) ) ? Kirki::$config['global'] : array(); |
|
260
|
|
- if ( 'global' !== $this->kirki_config && isset( Kirki::$config[ $this->kirki_config ] ) ) { |
|
261
|
|
- $config_defaults = Kirki::$config[ $this->kirki_config ]; |
|
|
260
|
+ if ( 'global' !== $this->kirki_config && isset( Kirki::$config[$this->kirki_config] ) ) { |
|
|
261
|
+ $config_defaults = Kirki::$config[$this->kirki_config]; |
|
262
|
262
|
} |
|
263
|
263
|
$config_defaults = ( is_array( $config_defaults ) ) ? $config_defaults : array(); |
|
264
|
264
|
foreach ( $config_defaults as $key => $value ) { |
|
265
|
|
- if ( isset( $defaults[ $key ] ) && ! empty( $value ) && $value !== $defaults[ $key ] ) { |
|
266
|
|
- $defaults[ $key ] = $value; |
|
|
265
|
+ if ( isset( $defaults[$key] ) && ! empty( $value ) && $value !== $defaults[$key] ) { |
|
|
266
|
+ $defaults[$key] = $value; |
|
267
|
267
|
} |
|
268
|
268
|
} |
|
269
|
269
|
|
|
@@ -313,11 +313,11 @@ discard block |
|
|
block discarded – undo |
|
313
|
313
|
// Get all arguments with their values. |
|
314
|
314
|
$args = get_object_vars( $this ); |
|
315
|
315
|
foreach ( array_keys( $args ) { |
|
316
|
|
- $args[ $key ] = $this->$key; |
|
|
316
|
+ $args[$key] = $this->$key; |
|
317
|
317
|
} |
|
318
|
318
|
|
|
319
|
319
|
// Add the field to the static $fields variable properly indexed. |
|
320
|
|
- Kirki::$fields[ $this->settings ] = $args; |
|
|
320
|
+ Kirki::$fields[$this->settings] = $args; |
|
321
|
321
|
|
|
322
|
322
|
} |
|
323
|
323
|
|
|
@@ -338,7 +338,7 @@ discard block |
|
|
block discarded – undo |
|
338
|
338
|
$property_parts = explode( '_', $property ); |
|
339
|
339
|
} |
|
340
|
340
|
foreach ( $property_parts as $property_part_k => $property_part_v ) { |
|
341
|
|
- $property_parts[ $property_part_k ] = ucfirst( $property_part_v ); |
|
|
341
|
+ $property_parts[$property_part_k] = ucfirst( $property_part_v ); |
|
342
|
342
|
} |
|
343
|
343
|
return 'Kirki_Field_Property_' . implode( '_', $property_parts ); |
|
344
|
344
|
} |
|
@@ -434,7 +434,7 @@ discard block |
|
|
block discarded – undo |
|
434
|
434
|
if ( ! is_array( $args ) || ! isset( $args['selector'] ) || ! isset( $args['render_callback'] ) || ! is_callable( $args['render_callback'] ) ) { |
|
435
|
435
|
/* translators: %1$s represents the field ID where the error occurs. */ |
|
436
|
436
|
_doing_it_wrong( __METHOD__, sprintf( esc_attr__( '"partial_refresh" invalid entry in field %s', 'kirki' ), esc_attr( $this->settings ) ), '3.0.10' ); |
|
437
|
|
- unset( $this->partial_refresh[ $id ] ); |
|
|
437
|
+ unset( $this->partial_refresh[$id] ); |
|
438
|
438
|
continue; |
|
439
|
439
|
} |
|
440
|
440
|
} |
|
@@ -462,10 +462,10 @@ discard block |
|
|
block discarded – undo |
|
462
|
462
|
} |
|
463
|
463
|
$settings = array(); |
|
464
|
464
|
foreach ( $this->settings as $setting_key => $setting_value ) { |
|
465
|
|
- $settings[ sanitize_key( $setting_key ) ] = esc_attr( $setting_value ); |
|
|
465
|
+ $settings[sanitize_key( $setting_key )] = esc_attr( $setting_value ); |
|
466
|
466
|
// If we're using serialized options then we need to spice this up. |
|
467
|
467
|
if ( 'option' === $this->option_type && '' !== $this->option_name && ( false === strpos( $setting_key, '[' ) ) ) { |
|
468
|
|
- $settings[ sanitize_key( $setting_key ) ] = esc_attr( $this->option_name ) . '[' . esc_attr( $setting_value ) . ']'; |
|
|
468
|
+ $settings[sanitize_key( $setting_key )] = esc_attr( $this->option_name ) . '[' . esc_attr( $setting_value ) . ']'; |
|
469
|
469
|
} |
|
470
|
470
|
} |
|
471
|
471
|
$this->settings = $settings; |