@@ -331,14 +331,14 @@ discard block |
||
331 | 331 | |
332 | 332 | // Get the config arguments, and merge them with the defaults. |
333 | 333 | $config_defaults = ( isset( Kirki::$config['global'] ) ) ? Kirki::$config['global'] : array(); |
334 | - if ( 'global' !== $this->kirki_config && isset( Kirki::$config[ $this->kirki_config ] ) ) { |
|
335 | - $config_defaults = Kirki::$config[ $this->kirki_config ]; |
|
334 | + if ( 'global' !== $this->kirki_config && isset( Kirki::$config[$this->kirki_config] ) ) { |
|
335 | + $config_defaults = Kirki::$config[$this->kirki_config]; |
|
336 | 336 | } |
337 | 337 | $config_defaults = ( is_array( $config_defaults ) ) ? $config_defaults : array(); |
338 | 338 | foreach ( $config_defaults as $key => $value ) { |
339 | - if ( isset( $defaults[ $key ] ) ) { |
|
340 | - if ( ! empty( $value ) && $value != $defaults[ $key ] ) { |
|
341 | - $defaults[ $key ] = $value; |
|
339 | + if ( isset( $defaults[$key] ) ) { |
|
340 | + if ( ! empty( $value ) && $value != $defaults[$key] ) { |
|
341 | + $defaults[$key] = $value; |
|
342 | 342 | } |
343 | 343 | } |
344 | 344 | } |
@@ -376,8 +376,8 @@ discard block |
||
376 | 376 | // Remove any whitelisted properties from above. |
377 | 377 | // These will get a free pass, completely unfiltered. |
378 | 378 | foreach ( $whitelisted_properties as $key => $default_value ) { |
379 | - if ( isset( $properties[ $key ] ) ) { |
|
380 | - unset( $properties[ $key ] ); |
|
379 | + if ( isset( $properties[$key] ) ) { |
|
380 | + unset( $properties[$key] ); |
|
381 | 381 | } |
382 | 382 | } |
383 | 383 | |
@@ -409,7 +409,7 @@ discard block |
||
409 | 409 | // Get all arguments with their values. |
410 | 410 | $args = get_object_vars( $this ); |
411 | 411 | foreach ( $args as $key => $default_value ) { |
412 | - $args[ $key ] = $this->$key; |
|
412 | + $args[$key] = $this->$key; |
|
413 | 413 | } |
414 | 414 | |
415 | 415 | // Add the whitelisted properties through the back door. |
@@ -417,11 +417,11 @@ discard block |
||
417 | 417 | if ( ! isset( $this->$key ) ) { |
418 | 418 | $this->$key = $default_value; |
419 | 419 | } |
420 | - $args[ $key ] = $this->$key; |
|
420 | + $args[$key] = $this->$key; |
|
421 | 421 | } |
422 | 422 | |
423 | 423 | // Add the field to the static $fields variable properly indexed. |
424 | - Kirki::$fields[ $this->settings ] = $args; |
|
424 | + Kirki::$fields[$this->settings] = $args; |
|
425 | 425 | |
426 | 426 | } |
427 | 427 | |
@@ -524,7 +524,7 @@ discard block |
||
524 | 524 | } |
525 | 525 | foreach ( $this->partial_refresh as $id => $args ) { |
526 | 526 | if ( ! is_array( $args ) || ! isset( $args['selector'] ) || ! isset( $args['render_callback'] ) || ! is_callable( $args['render_callback'] ) ) { |
527 | - unset( $this->partial_refresh[ $id ] ); |
|
527 | + unset( $this->partial_refresh[$id] ); |
|
528 | 528 | continue; |
529 | 529 | } |
530 | 530 | } |
@@ -552,10 +552,10 @@ discard block |
||
552 | 552 | } |
553 | 553 | $settings = array(); |
554 | 554 | foreach ( $this->settings as $setting_key => $setting_value ) { |
555 | - $settings[ sanitize_key( $setting_key ) ] = esc_attr( $setting_value ); |
|
555 | + $settings[sanitize_key( $setting_key )] = esc_attr( $setting_value ); |
|
556 | 556 | // If we're using serialized options then we need to spice this up. |
557 | 557 | if ( 'option' === $this->option_type && '' !== $this->option_name && ( false === strpos( $setting_key, '[' ) ) ) { |
558 | - $settings[ sanitize_key( $setting_key ) ] = esc_attr( $this->option_name ) . '[' . esc_attr( $setting_value ) . ']'; |
|
558 | + $settings[sanitize_key( $setting_key )] = esc_attr( $this->option_name ) . '[' . esc_attr( $setting_value ) . ']'; |
|
559 | 559 | } |
560 | 560 | } |
561 | 561 | $this->settings = $settings; |
@@ -652,7 +652,7 @@ discard block |
||
652 | 652 | ); |
653 | 653 | |
654 | 654 | if ( array_key_exists( $this->type, $default_callbacks ) ) { |
655 | - $this->sanitize_callback = $default_callbacks[ $this->type ]; |
|
655 | + $this->sanitize_callback = $default_callbacks[$this->type]; |
|
656 | 656 | } |
657 | 657 | |
658 | 658 | } |
@@ -102,8 +102,8 @@ discard block |
||
102 | 102 | if ( isset( $output['pattern_replace'] ) && is_array( $output['pattern_replace'] ) ) { |
103 | 103 | $option_type = 'theme_mod'; |
104 | 104 | $option_name = false; |
105 | - if ( isset( Kirki::$config[ $this->config_id ] ) ) { |
|
106 | - $config = Kirki::$config[ $this->config_id ]; |
|
105 | + if ( isset( Kirki::$config[$this->config_id] ) ) { |
|
106 | + $config = Kirki::$config[$this->config_id]; |
|
107 | 107 | $option_type = ( isset( $config['option_type'] ) ) ? $config['option_type'] : 'theme_mod'; |
108 | 108 | if ( 'option' === $option_type || 'site_option' === $option_type ) { |
109 | 109 | $option_name = ( isset( $config['option_name'] ) ) ? $config['option_name'] : false; |
@@ -119,16 +119,16 @@ discard block |
||
119 | 119 | if ( is_array( $options ) ) { |
120 | 120 | if ( $option_name ) { |
121 | 121 | $subkey = str_replace( array( $option_name, '[', ']' ), '', $replace ); |
122 | - $replacement = ( isset( $options[ $subkey ] ) ) ? $options[ $subkey ] : ''; |
|
122 | + $replacement = ( isset( $options[$subkey] ) ) ? $options[$subkey] : ''; |
|
123 | 123 | break; |
124 | 124 | } |
125 | - $replacement = ( isset( $options[ $replace ] ) ) ? $options[ $replace ] : ''; |
|
125 | + $replacement = ( isset( $options[$replace] ) ) ? $options[$replace] : ''; |
|
126 | 126 | break; |
127 | 127 | } |
128 | 128 | $replacement = get_option( $replace ); |
129 | 129 | break; |
130 | 130 | case 'site_option': |
131 | - $replacement = ( is_array( $options ) && isset( $options[ $replace ] ) ) ? $options[ $replace ] : get_site_option( $replace ); |
|
131 | + $replacement = ( is_array( $options ) && isset( $options[$replace] ) ) ? $options[$replace] : get_site_option( $replace ); |
|
132 | 132 | break; |
133 | 133 | case 'user_meta': |
134 | 134 | $user_id = get_current_user_id(); |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | } |
184 | 184 | // If 'choice' is defined check for sub-values too. |
185 | 185 | // Fixes https://github.com/aristath/kirki/issues/1416. |
186 | - if ( isset( $output['choice'] ) && isset( $value[ $output['choice'] ] ) && $exclude === $value[ $output['choice'] ] ) { |
|
186 | + if ( isset( $output['choice'] ) && isset( $value[$output['choice']] ) && $exclude === $value[$output['choice']] ) { |
|
187 | 187 | $skip = true; |
188 | 188 | } |
189 | 189 | } |
@@ -229,9 +229,9 @@ discard block |
||
229 | 229 | return; |
230 | 230 | } |
231 | 231 | $output['media_query'] = ( isset( $output['media_query'] ) ) ? $output['media_query'] : 'global'; |
232 | - $output['prefix'] = ( isset( $output['prefix'] ) ) ? $output['prefix'] : ''; |
|
233 | - $output['units'] = ( isset( $output['units'] ) ) ? $output['units'] : ''; |
|
234 | - $output['suffix'] = ( isset( $output['suffix'] ) ) ? $output['suffix'] : ''; |
|
232 | + $output['prefix'] = ( isset( $output['prefix'] ) ) ? $output['prefix'] : ''; |
|
233 | + $output['units'] = ( isset( $output['units'] ) ) ? $output['units'] : ''; |
|
234 | + $output['suffix'] = ( isset( $output['suffix'] ) ) ? $output['suffix'] : ''; |
|
235 | 235 | |
236 | 236 | // Properties that can accept multiple values. |
237 | 237 | // Useful for example for gradients where all browsers use the "background-image" property |
@@ -240,13 +240,13 @@ discard block |
||
240 | 240 | 'background-image', |
241 | 241 | ); |
242 | 242 | if ( in_array( $output['property'], $accepts_multiple, true ) ) { |
243 | - if ( isset( $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] ) && ! is_array( $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] ) ) { |
|
244 | - $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = (array) $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ]; |
|
243 | + if ( isset( $this->styles[$output['media_query']][$output['element']][$output['property']] ) && ! is_array( $this->styles[$output['media_query']][$output['element']][$output['property']] ) ) { |
|
244 | + $this->styles[$output['media_query']][$output['element']][$output['property']] = (array) $this->styles[$output['media_query']][$output['element']][$output['property']]; |
|
245 | 245 | } |
246 | - $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ][] = $output['prefix'] . $value . $output['units'] . $output['suffix']; |
|
246 | + $this->styles[$output['media_query']][$output['element']][$output['property']][] = $output['prefix'] . $value . $output['units'] . $output['suffix']; |
|
247 | 247 | return; |
248 | 248 | } |
249 | - $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = $output['prefix'] . $value . $output['units'] . $output['suffix']; |
|
249 | + $this->styles[$output['media_query']][$output['element']][$output['property']] = $output['prefix'] . $value . $output['units'] . $output['suffix']; |
|
250 | 250 | } |
251 | 251 | |
252 | 252 | /** |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | 'background-position' => 'Kirki_Output_Property_Background_Position', |
267 | 267 | ) ); |
268 | 268 | if ( array_key_exists( $property, $properties ) ) { |
269 | - $classname = $properties[ $property ]; |
|
269 | + $classname = $properties[$property]; |
|
270 | 270 | $obj = new $classname( $property, $value ); |
271 | 271 | return $obj->get_value(); |
272 | 272 | } |