@@ -243,28 +243,28 @@ discard block |
||
243 | 243 | */ |
244 | 244 | public function __construct( $config_id = 'global', $args = array() ) { |
245 | 245 | |
246 | - if ( isset( $args['setting'] ) && ! empty( $args['setting'] ) && ( ! isset( $args['settings'] ) || empty( $args['settings'] ) ) ) { |
|
246 | + if ( isset( $args[ 'setting' ] ) && ! empty( $args[ 'setting' ] ) && ( ! isset( $args[ 'settings' ] ) || empty( $args[ 'settings' ] ) ) ) { |
|
247 | 247 | /* translators: %s represents the field ID where the error occurs. */ |
248 | - _doing_it_wrong( __METHOD__, sprintf( esc_attr__( 'Typo found in field %s - setting instead of settings.', 'kirki' ), esc_attr( $args['settings'] ) ), '3.0.10' ); |
|
249 | - $args['settings'] = $args['setting']; |
|
250 | - unset( $args['setting'] ); |
|
248 | + _doing_it_wrong( __METHOD__, sprintf( esc_attr__( 'Typo found in field %s - setting instead of settings.', 'kirki' ), esc_attr( $args[ 'settings' ] ) ), '3.0.10' ); |
|
249 | + $args[ 'settings' ] = $args[ 'setting' ]; |
|
250 | + unset( $args[ 'setting' ] ); |
|
251 | 251 | } |
252 | 252 | |
253 | 253 | // In case the user only provides 1 argument, |
254 | 254 | // assume that the provided argument is $args and set $config_id = 'global'. |
255 | 255 | if ( is_array( $config_id ) && empty( $args ) ) { |
256 | 256 | /* translators: %1$s represents the field ID where the error occurs. %2$s is the URL in the documentation site. */ |
257 | - _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' ); |
|
257 | + _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' ); |
|
258 | 258 | $args = $config_id; |
259 | 259 | $config_id = 'global'; |
260 | 260 | } |
261 | 261 | |
262 | - $args['kirki_config'] = $config_id; |
|
262 | + $args[ 'kirki_config' ] = $config_id; |
|
263 | 263 | |
264 | 264 | $this->kirki_config = trim( esc_attr( $config_id ) ); |
265 | 265 | if ( '' === $config_id ) { |
266 | 266 | /* translators: %1$s represents the field ID where the error occurs. %2$s is the URL in the documentation site. */ |
267 | - _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' ); |
|
267 | + _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' ); |
|
268 | 268 | $this->kirki_config = 'global'; |
269 | 269 | } |
270 | 270 | |
@@ -272,7 +272,7 @@ discard block |
||
272 | 272 | $defaults = get_class_vars( __CLASS__ ); |
273 | 273 | |
274 | 274 | // Get the config arguments, and merge them with the defaults. |
275 | - $config_defaults = ( isset( Kirki::$config['global'] ) ) ? Kirki::$config['global'] : array(); |
|
275 | + $config_defaults = ( isset( Kirki::$config[ 'global' ] ) ) ? Kirki::$config[ 'global' ] : array(); |
|
276 | 276 | if ( 'global' !== $this->kirki_config && isset( Kirki::$config[ $this->kirki_config ] ) ) { |
277 | 277 | $config_defaults = Kirki::$config[ $this->kirki_config ]; |
278 | 278 | } |
@@ -420,7 +420,7 @@ discard block |
||
420 | 420 | $this->partial_refresh = array(); |
421 | 421 | } |
422 | 422 | foreach ( $this->partial_refresh as $id => $args ) { |
423 | - if ( ! is_array( $args ) || ! isset( $args['selector'] ) || ! isset( $args['render_callback'] ) || ! is_callable( $args['render_callback'] ) ) { |
|
423 | + if ( ! is_array( $args ) || ! isset( $args[ 'selector' ] ) || ! isset( $args[ 'render_callback' ] ) || ! is_callable( $args[ 'render_callback' ] ) ) { |
|
424 | 424 | /* translators: %1$s represents the field ID where the error occurs. */ |
425 | 425 | _doing_it_wrong( __METHOD__, sprintf( esc_attr__( '"partial_refresh" invalid entry in field %s', 'kirki' ), esc_attr( $this->settings ) ), '3.0.10' ); |
426 | 426 | unset( $this->partial_refresh[ $id ] ); |
@@ -458,8 +458,8 @@ discard block |
||
458 | 458 | } |
459 | 459 | } |
460 | 460 | $this->settings = $settings; |
461 | - if ( isset( $this->settings['kirki_placeholder_setting'] ) ) { |
|
462 | - $this->settings = $this->settings['kirki_placeholder_setting']; |
|
461 | + if ( isset( $this->settings[ 'kirki_placeholder_setting' ] ) ) { |
|
462 | + $this->settings = $this->settings[ 'kirki_placeholder_setting' ]; |
|
463 | 463 | } |
464 | 464 | } |
465 | 465 | |
@@ -473,7 +473,7 @@ discard block |
||
473 | 473 | protected function set_active_callback() { |
474 | 474 | |
475 | 475 | if ( is_array( $this->active_callback ) && ! is_callable( $this->active_callback ) ) { |
476 | - if ( isset( $this->active_callback[0] ) ) { |
|
476 | + if ( isset( $this->active_callback[ 0 ] ) ) { |
|
477 | 477 | $this->required = $this->active_callback; |
478 | 478 | } |
479 | 479 | } |
@@ -559,34 +559,34 @@ discard block |
||
559 | 559 | ); |
560 | 560 | } |
561 | 561 | // Convert to array of arrays if needed. |
562 | - if ( isset( $this->output['element'] ) ) { |
|
562 | + if ( isset( $this->output[ 'element' ] ) ) { |
|
563 | 563 | /* translators: The field ID where the error occurs. */ |
564 | 564 | _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' ); |
565 | 565 | $this->output = array( $this->output ); |
566 | 566 | } |
567 | 567 | foreach ( $this->output as $key => $output ) { |
568 | - if ( empty( $output ) || ! isset( $output['element'] ) ) { |
|
568 | + if ( empty( $output ) || ! isset( $output[ 'element' ] ) ) { |
|
569 | 569 | unset( $this->output[ $key ] ); |
570 | 570 | continue; |
571 | 571 | } |
572 | - if ( ! isset( $output['sanitize_callback'] ) && isset( $output['callback'] ) ) { |
|
573 | - $this->output[ $key ]['sanitize_callback'] = $output['callback']; |
|
572 | + if ( ! isset( $output[ 'sanitize_callback' ] ) && isset( $output[ 'callback' ] ) ) { |
|
573 | + $this->output[ $key ][ 'sanitize_callback' ] = $output[ 'callback' ]; |
|
574 | 574 | } |
575 | 575 | // Convert element arrays to strings. |
576 | - if ( isset( $output['element'] ) && is_array( $output['element'] ) ) { |
|
577 | - $this->output[ $key ]['element'] = array_unique( $this->output[ $key ]['element'] ); |
|
578 | - sort( $this->output[ $key ]['element'] ); |
|
576 | + if ( isset( $output[ 'element' ] ) && is_array( $output[ 'element' ] ) ) { |
|
577 | + $this->output[ $key ][ 'element' ] = array_unique( $this->output[ $key ][ 'element' ] ); |
|
578 | + sort( $this->output[ $key ][ 'element' ] ); |
|
579 | 579 | |
580 | 580 | // Trim each element in the array. |
581 | - foreach ( $this->output[ $key ]['element'] as $index => $element ) { |
|
582 | - $this->output[ $key ]['element'][ $index ] = trim( $element ); |
|
581 | + foreach ( $this->output[ $key ][ 'element' ] as $index => $element ) { |
|
582 | + $this->output[ $key ][ 'element' ][ $index ] = trim( $element ); |
|
583 | 583 | } |
584 | - $this->output[ $key ]['element'] = implode( ',', $this->output[ $key ]['element'] ); |
|
584 | + $this->output[ $key ][ 'element' ] = implode( ',', $this->output[ $key ][ 'element' ] ); |
|
585 | 585 | } |
586 | 586 | |
587 | 587 | // Fix for https://github.com/aristath/kirki/issues/1659#issuecomment-346229751. |
588 | - $this->output[ $key ]['element'] = str_replace( array( "\t", "\n", "\r", "\0", "\x0B" ), ' ', $this->output[ $key ]['element'] ); |
|
589 | - $this->output[ $key ]['element'] = trim( preg_replace( '/\s+/', ' ', $this->output[ $key ]['element'] ) ); |
|
588 | + $this->output[ $key ][ 'element' ] = str_replace( array( "\t", "\n", "\r", "\0", "\x0B" ), ' ', $this->output[ $key ][ 'element' ] ); |
|
589 | + $this->output[ $key ][ 'element' ] = trim( preg_replace( '/\s+/', ' ', $this->output[ $key ][ 'element' ] ) ); |
|
590 | 590 | } |
591 | 591 | } |
592 | 592 | |
@@ -619,23 +619,23 @@ discard block |
||
619 | 619 | |
620 | 620 | // Start going through each item in the $output array. |
621 | 621 | foreach ( $this->output as $output ) { |
622 | - $output['function'] = ( isset( $output['function'] ) ) ? $output['function'] : 'style'; |
|
622 | + $output[ 'function' ] = ( isset( $output[ 'function' ] ) ) ? $output[ 'function' ] : 'style'; |
|
623 | 623 | |
624 | 624 | // If 'element' or 'property' are not defined, skip this. |
625 | - if ( ! isset( $output['element'] ) || ! isset( $output['property'] ) ) { |
|
625 | + if ( ! isset( $output[ 'element' ] ) || ! isset( $output[ 'property' ] ) ) { |
|
626 | 626 | continue; |
627 | 627 | } |
628 | - if ( is_array( $output['element'] ) ) { |
|
629 | - $output['element'] = implode( ',', $output['element'] ); |
|
628 | + if ( is_array( $output[ 'element' ] ) ) { |
|
629 | + $output[ 'element' ] = implode( ',', $output[ 'element' ] ); |
|
630 | 630 | } |
631 | 631 | |
632 | 632 | // If there's a sanitize_callback defined skip this, unless we also have a js_callback defined. |
633 | - if ( isset( $output['sanitize_callback'] ) && ! empty( $output['sanitize_callback'] ) && ! isset( $output['js_callback'] ) ) { |
|
633 | + if ( isset( $output[ 'sanitize_callback' ] ) && ! empty( $output[ 'sanitize_callback' ] ) && ! isset( $output[ 'js_callback' ] ) ) { |
|
634 | 634 | continue; |
635 | 635 | } |
636 | 636 | |
637 | 637 | // If we got this far, it's safe to add this. |
638 | - $js_vars[] = $output; |
|
638 | + $js_vars[ ] = $output; |
|
639 | 639 | } |
640 | 640 | |
641 | 641 | // Did we manage to get all the items from 'output'? |
@@ -660,7 +660,7 @@ discard block |
||
660 | 660 | $variable = ( is_string( $this->variables ) && ! empty( $this->variables ) ) ? $this->variables : false; |
661 | 661 | $this->variables = array(); |
662 | 662 | if ( $variable && empty( $this->variables ) ) { |
663 | - $this->variables[0]['name'] = $variable; |
|
663 | + $this->variables[ 0 ][ 'name' ] = $variable; |
|
664 | 664 | } |
665 | 665 | } |
666 | 666 | } |
@@ -708,12 +708,12 @@ discard block |
||
708 | 708 | if ( is_string( $this->css_vars ) ) { |
709 | 709 | $this->css_vars = array( $this->css_vars ); |
710 | 710 | } |
711 | - if ( isset( $this->css_vars[0] ) && is_string( $this->css_vars[0] ) ) { |
|
711 | + if ( isset( $this->css_vars[ 0 ] ) && is_string( $this->css_vars[ 0 ] ) ) { |
|
712 | 712 | $this->css_vars = array( $this->css_vars ); |
713 | 713 | } |
714 | 714 | foreach ( $this->css_vars as $key => $val ) { |
715 | - if ( ! isset( $val[1] ) ) { |
|
716 | - $this->css_vars[ $key ][1] = '$'; |
|
715 | + if ( ! isset( $val[ 1 ] ) ) { |
|
716 | + $this->css_vars[ $key ][ 1 ] = '$'; |
|
717 | 717 | } |
718 | 718 | } |
719 | 719 | } |
@@ -76,15 +76,15 @@ discard block |
||
76 | 76 | echo '<style id="kirki-css-vars">'; |
77 | 77 | echo ':root{'; |
78 | 78 | foreach ( $fields as $id => $args ) { |
79 | - if ( ! isset( $args['css_vars'] ) || empty( $args['css_vars'] ) ) { |
|
79 | + if ( ! isset( $args[ 'css_vars' ] ) || empty( $args[ 'css_vars' ] ) ) { |
|
80 | 80 | continue; |
81 | 81 | } |
82 | - $val = Kirki_Values::get_value( $args['kirki_config'], $id ); |
|
83 | - foreach ( $args['css_vars'] as $css_var ) { |
|
84 | - if ( isset( $css_var[2] ) && is_array( $val ) && isset( $val[ $css_var[2] ] ) ) { |
|
85 | - $val = $val[ $css_var[2] ]; |
|
82 | + $val = Kirki_Values::get_value( $args[ 'kirki_config' ], $id ); |
|
83 | + foreach ( $args[ 'css_vars' ] as $css_var ) { |
|
84 | + if ( isset( $css_var[ 2 ] ) && is_array( $val ) && isset( $val[ $css_var[ 2 ] ] ) ) { |
|
85 | + $val = $val[ $css_var[ 2 ] ]; |
|
86 | 86 | } |
87 | - echo esc_attr( $css_var[0] ) . ':' . esc_attr( str_replace( '$', $val, $css_var[1] ) ) . ';'; |
|
87 | + echo esc_attr( $css_var[ 0 ] ) . ':' . esc_attr( str_replace( '$', $val, $css_var[ 1 ] ) ) . ';'; |
|
88 | 88 | } |
89 | 89 | } |
90 | 90 | echo '}'; |
@@ -105,8 +105,8 @@ discard block |
||
105 | 105 | $fields = Kirki::$fields; |
106 | 106 | $data = array(); |
107 | 107 | foreach ( $fields as $field ) { |
108 | - if ( isset( $field['transport'] ) && 'postMessage' === $field['transport'] && isset( $field['css_vars'] ) && ! empty( $field['css_vars'] ) ) { |
|
109 | - $data[] = $field; |
|
108 | + if ( isset( $field[ 'transport' ] ) && 'postMessage' === $field[ 'transport' ] && isset( $field[ 'css_vars' ] ) && ! empty( $field[ 'css_vars' ] ) ) { |
|
109 | + $data[ ] = $field; |
|
110 | 110 | } |
111 | 111 | } |
112 | 112 | wp_localize_script( 'kirki_auto_css_vars', 'kirkiCssVarFields', $data ); |
@@ -158,41 +158,41 @@ |
||
158 | 158 | // Get the basics from the parent class. |
159 | 159 | parent::to_json(); |
160 | 160 | // Default. |
161 | - $this->json['default'] = $this->setting->default; |
|
161 | + $this->json[ 'default' ] = $this->setting->default; |
|
162 | 162 | if ( isset( $this->default ) ) { |
163 | - $this->json['default'] = $this->default; |
|
163 | + $this->json[ 'default' ] = $this->default; |
|
164 | 164 | } |
165 | 165 | // Required. |
166 | - $this->json['required'] = $this->required; |
|
166 | + $this->json[ 'required' ] = $this->required; |
|
167 | 167 | // Output. |
168 | - $this->json['output'] = $this->output; |
|
168 | + $this->json[ 'output' ] = $this->output; |
|
169 | 169 | // Value. |
170 | - $this->json['value'] = $this->value(); |
|
170 | + $this->json[ 'value' ] = $this->value(); |
|
171 | 171 | // Choices. |
172 | - $this->json['choices'] = $this->choices; |
|
172 | + $this->json[ 'choices' ] = $this->choices; |
|
173 | 173 | // The link. |
174 | - $this->json['link'] = $this->get_link(); |
|
174 | + $this->json[ 'link' ] = $this->get_link(); |
|
175 | 175 | // The ID. |
176 | - $this->json['id'] = $this->id; |
|
176 | + $this->json[ 'id' ] = $this->id; |
|
177 | 177 | // Translation strings. |
178 | - $this->json['l10n'] = $this->l10n(); |
|
178 | + $this->json[ 'l10n' ] = $this->l10n(); |
|
179 | 179 | // The ajaxurl in case we need it. |
180 | - $this->json['ajaxurl'] = admin_url( 'admin-ajax.php' ); |
|
180 | + $this->json[ 'ajaxurl' ] = admin_url( 'admin-ajax.php' ); |
|
181 | 181 | // Input attributes. |
182 | - $this->json['inputAttrs'] = ''; |
|
182 | + $this->json[ 'inputAttrs' ] = ''; |
|
183 | 183 | foreach ( $this->input_attrs as $attr => $value ) { |
184 | - $this->json['inputAttrs'] .= $attr . '="' . esc_attr( $value ) . '" '; |
|
184 | + $this->json[ 'inputAttrs' ] .= $attr . '="' . esc_attr( $value ) . '" '; |
|
185 | 185 | } |
186 | 186 | // The kirki-config. |
187 | - $this->json['kirkiConfig'] = $this->kirki_config; |
|
187 | + $this->json[ 'kirkiConfig' ] = $this->kirki_config; |
|
188 | 188 | // The option-type. |
189 | - $this->json['kirkiOptionType'] = $this->option_type; |
|
189 | + $this->json[ 'kirkiOptionType' ] = $this->option_type; |
|
190 | 190 | // The option-name. |
191 | - $this->json['kirkiOptionName'] = $this->option_name; |
|
191 | + $this->json[ 'kirkiOptionName' ] = $this->option_name; |
|
192 | 192 | // The preset. |
193 | - $this->json['preset'] = $this->preset; |
|
193 | + $this->json[ 'preset' ] = $this->preset; |
|
194 | 194 | // The CSS-Variables. |
195 | - $this->json['css-var'] = $this->css_vars; |
|
195 | + $this->json[ 'css-var' ] = $this->css_vars; |
|
196 | 196 | } |
197 | 197 | |
198 | 198 | /** |