@@ -62,8 +62,8 @@ discard block |
||
| 62 | 62 | |
| 63 | 63 | // Apply the kirki_config filter. |
| 64 | 64 | $config = apply_filters( 'kirki_config', array() ); |
| 65 | - if ( isset( $config['url_path'] ) ) { |
|
| 66 | - Kirki::$url = $config['url_path']; |
|
| 65 | + if ( isset( $config[ 'url_path' ] ) ) { |
|
| 66 | + Kirki::$url = $config[ 'url_path' ]; |
|
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | // Make sure the right protocol is used. |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | |
| 144 | 144 | $this->control_types = $this->default_control_types(); |
| 145 | 145 | if ( ! class_exists( 'WP_Customize_Code_Editor_Control' ) ) { |
| 146 | - unset( $this->control_types['code_editor'] ); |
|
| 146 | + unset( $this->control_types[ 'code_editor' ] ); |
|
| 147 | 147 | } |
| 148 | 148 | foreach ( $this->control_types as $key => $classname ) { |
| 149 | 149 | if ( ! class_exists( $classname ) ) { |
@@ -174,10 +174,10 @@ discard block |
||
| 174 | 174 | if ( ! empty( Kirki::$panels ) ) { |
| 175 | 175 | foreach ( Kirki::$panels as $panel_args ) { |
| 176 | 176 | // Extra checks for nested panels. |
| 177 | - if ( isset( $panel_args['panel'] ) ) { |
|
| 178 | - if ( isset( Kirki::$panels[ $panel_args['panel'] ] ) ) { |
|
| 177 | + if ( isset( $panel_args[ 'panel' ] ) ) { |
|
| 178 | + if ( isset( Kirki::$panels[ $panel_args[ 'panel' ] ] ) ) { |
|
| 179 | 179 | // Set the type to nested. |
| 180 | - $panel_args['type'] = 'kirki-nested'; |
|
| 180 | + $panel_args[ 'type' ] = 'kirki-nested'; |
|
| 181 | 181 | } |
| 182 | 182 | } |
| 183 | 183 | |
@@ -195,14 +195,14 @@ discard block |
||
| 195 | 195 | if ( ! empty( Kirki::$sections ) ) { |
| 196 | 196 | foreach ( Kirki::$sections as $section_args ) { |
| 197 | 197 | // Extra checks for nested sections. |
| 198 | - if ( isset( $section_args['section'] ) ) { |
|
| 199 | - if ( isset( Kirki::$sections[ $section_args['section'] ] ) ) { |
|
| 198 | + if ( isset( $section_args[ 'section' ] ) ) { |
|
| 199 | + if ( isset( Kirki::$sections[ $section_args[ 'section' ] ] ) ) { |
|
| 200 | 200 | // Set the type to nested. |
| 201 | - $section_args['type'] = 'kirki-nested'; |
|
| 201 | + $section_args[ 'type' ] = 'kirki-nested'; |
|
| 202 | 202 | // We need to check if the parent section is nested inside a panel. |
| 203 | - $parent_section = Kirki::$sections[ $section_args['section'] ]; |
|
| 204 | - if ( isset( $parent_section['panel'] ) ) { |
|
| 205 | - $section_args['panel'] = $parent_section['panel']; |
|
| 203 | + $parent_section = Kirki::$sections[ $section_args[ 'section' ] ]; |
|
| 204 | + if ( isset( $parent_section[ 'panel' ] ) ) { |
|
| 205 | + $section_args[ 'panel' ] = $parent_section[ 'panel' ]; |
|
| 206 | 206 | } |
| 207 | 207 | } |
| 208 | 208 | } |
@@ -83,13 +83,13 @@ discard block |
||
| 83 | 83 | */ |
| 84 | 84 | protected function apply_sanitize_callback( $output, $value ) { |
| 85 | 85 | |
| 86 | - if ( isset( $output['sanitize_callback'] ) && null !== $output['sanitize_callback'] ) { |
|
| 86 | + if ( isset( $output[ 'sanitize_callback' ] ) && null !== $output[ 'sanitize_callback' ] ) { |
|
| 87 | 87 | |
| 88 | 88 | // If the sanitize_callback is invalid, return the value. |
| 89 | - if ( ! is_callable( $output['sanitize_callback'] ) ) { |
|
| 89 | + if ( ! is_callable( $output[ 'sanitize_callback' ] ) ) { |
|
| 90 | 90 | return $value; |
| 91 | 91 | } |
| 92 | - return call_user_func( $output['sanitize_callback'], $this->value ); |
|
| 92 | + return call_user_func( $output[ 'sanitize_callback' ], $this->value ); |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | return $value; |
@@ -105,22 +105,22 @@ discard block |
||
| 105 | 105 | */ |
| 106 | 106 | protected function apply_value_pattern( $output, $value ) { |
| 107 | 107 | |
| 108 | - if ( isset( $output['value_pattern'] ) && ! empty( $output['value_pattern'] ) && is_string( $output['value_pattern'] ) ) { |
|
| 108 | + if ( isset( $output[ 'value_pattern' ] ) && ! empty( $output[ 'value_pattern' ] ) && is_string( $output[ 'value_pattern' ] ) ) { |
|
| 109 | 109 | if ( ! is_array( $value ) ) { |
| 110 | - $value = str_replace( '$', $value, $output['value_pattern'] ); |
|
| 110 | + $value = str_replace( '$', $value, $output[ 'value_pattern' ] ); |
|
| 111 | 111 | } |
| 112 | 112 | if ( is_array( $value ) ) { |
| 113 | 113 | foreach ( array_keys( $value ) as $value_k ) { |
| 114 | 114 | if ( ! is_string( $value[ $value_k ] ) ) { |
| 115 | 115 | continue; |
| 116 | 116 | } |
| 117 | - if ( isset( $output['choice'] ) ) { |
|
| 118 | - if ( $output['choice'] === $value_k ) { |
|
| 119 | - $value[ $output['choice'] ] = str_replace( '$', $value[ $output['choice'] ], $output['value_pattern'] ); |
|
| 117 | + if ( isset( $output[ 'choice' ] ) ) { |
|
| 118 | + if ( $output[ 'choice' ] === $value_k ) { |
|
| 119 | + $value[ $output[ 'choice' ] ] = str_replace( '$', $value[ $output[ 'choice' ] ], $output[ 'value_pattern' ] ); |
|
| 120 | 120 | } |
| 121 | 121 | continue; |
| 122 | 122 | } |
| 123 | - $value[ $value_k ] = str_replace( '$', $value[ $value_k ], $output['value_pattern'] ); |
|
| 123 | + $value[ $value_k ] = str_replace( '$', $value[ $value_k ], $output[ 'value_pattern' ] ); |
|
| 124 | 124 | } |
| 125 | 125 | } |
| 126 | 126 | $value = $this->apply_pattern_replace( $output, $value ); |
@@ -136,14 +136,14 @@ discard block |
||
| 136 | 136 | * @return string|array |
| 137 | 137 | */ |
| 138 | 138 | protected function apply_pattern_replace( $output, $value ) { |
| 139 | - if ( isset( $output['pattern_replace'] ) && is_array( $output['pattern_replace'] ) ) { |
|
| 139 | + if ( isset( $output[ 'pattern_replace' ] ) && is_array( $output[ 'pattern_replace' ] ) ) { |
|
| 140 | 140 | $option_type = ( '' !== Kirki::get_config_param( $this->config_id, 'option_type' ) ) ? Kirki::get_config_param( $this->config_id, 'option_type' ) : 'theme_mod'; |
| 141 | 141 | $option_name = Kirki::get_config_param( $this->config_id, 'option_name' ); |
| 142 | 142 | $options = array(); |
| 143 | 143 | if ( $option_name ) { |
| 144 | 144 | $options = ( 'site_option' === $option_type ) ? get_site_option( $option_name ) : get_option( $option_name ); |
| 145 | 145 | } |
| 146 | - foreach ( $output['pattern_replace'] as $search => $replace ) { |
|
| 146 | + foreach ( $output[ 'pattern_replace' ] as $search => $replace ) { |
|
| 147 | 147 | $replacement = ''; |
| 148 | 148 | switch ( $option_type ) { |
| 149 | 149 | case 'option': |
@@ -204,8 +204,8 @@ discard block |
||
| 204 | 204 | } |
| 205 | 205 | |
| 206 | 206 | // No need to proceed this if the current value is the same as in the "exclude" value. |
| 207 | - if ( isset( $output['exclude'] ) && is_array( $output['exclude'] ) ) { |
|
| 208 | - foreach ( $output['exclude'] as $exclude ) { |
|
| 207 | + if ( isset( $output[ 'exclude' ] ) && is_array( $output[ 'exclude' ] ) ) { |
|
| 208 | + foreach ( $output[ 'exclude' ] as $exclude ) { |
|
| 209 | 209 | if ( is_array( $value ) ) { |
| 210 | 210 | if ( is_array( $exclude ) ) { |
| 211 | 211 | $diff1 = array_diff( $value, $exclude ); |
@@ -218,7 +218,7 @@ discard block |
||
| 218 | 218 | // If 'choice' is defined check for sub-values too. |
| 219 | 219 | // Fixes https://github.com/aristath/kirki/issues/1416. |
| 220 | 220 | // @codingStandardsIgnoreLine WordPress.PHP.StrictComparisons.LooseComparison |
| 221 | - if ( isset( $output['choice'] ) && isset( $value[ $output['choice'] ] ) && $exclude == $value[ $output['choice'] ] ) { // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison |
|
| 221 | + if ( isset( $output[ 'choice' ] ) && isset( $value[ $output[ 'choice' ] ] ) && $exclude == $value[ $output[ 'choice' ] ] ) { // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison |
|
| 222 | 222 | $skip = true; |
| 223 | 223 | } |
| 224 | 224 | } |
@@ -239,10 +239,10 @@ discard block |
||
| 239 | 239 | // Apply any value patterns defined. |
| 240 | 240 | $value = $this->apply_value_pattern( $output, $value ); |
| 241 | 241 | |
| 242 | - if ( isset( $output['element'] ) && is_array( $output['element'] ) ) { |
|
| 243 | - $output['element'] = array_unique( $output['element'] ); |
|
| 244 | - sort( $output['element'] ); |
|
| 245 | - $output['element'] = implode( ',', $output['element'] ); |
|
| 242 | + if ( isset( $output[ 'element' ] ) && is_array( $output[ 'element' ] ) ) { |
|
| 243 | + $output[ 'element' ] = array_unique( $output[ 'element' ] ); |
|
| 244 | + sort( $output[ 'element' ] ); |
|
| 245 | + $output[ 'element' ] = implode( ',', $output[ 'element' ] ); |
|
| 246 | 246 | } |
| 247 | 247 | |
| 248 | 248 | $value = $this->process_value( $value, $output ); |
@@ -260,13 +260,13 @@ discard block |
||
| 260 | 260 | * @return null |
| 261 | 261 | */ |
| 262 | 262 | protected function process_output( $output, $value ) { |
| 263 | - if ( ! isset( $output['element'] ) || ! isset( $output['property'] ) ) { |
|
| 263 | + if ( ! isset( $output[ 'element' ] ) || ! isset( $output[ 'property' ] ) ) { |
|
| 264 | 264 | return; |
| 265 | 265 | } |
| 266 | - $output['media_query'] = ( isset( $output['media_query'] ) ) ? $output['media_query'] : 'global'; |
|
| 267 | - $output['prefix'] = ( isset( $output['prefix'] ) ) ? $output['prefix'] : ''; |
|
| 268 | - $output['units'] = ( isset( $output['units'] ) ) ? $output['units'] : ''; |
|
| 269 | - $output['suffix'] = ( isset( $output['suffix'] ) ) ? $output['suffix'] : ''; |
|
| 266 | + $output[ 'media_query' ] = ( isset( $output[ 'media_query' ] ) ) ? $output[ 'media_query' ] : 'global'; |
|
| 267 | + $output[ 'prefix' ] = ( isset( $output[ 'prefix' ] ) ) ? $output[ 'prefix' ] : ''; |
|
| 268 | + $output[ 'units' ] = ( isset( $output[ 'units' ] ) ) ? $output[ 'units' ] : ''; |
|
| 269 | + $output[ 'suffix' ] = ( isset( $output[ 'suffix' ] ) ) ? $output[ 'suffix' ] : ''; |
|
| 270 | 270 | |
| 271 | 271 | // Properties that can accept multiple values. |
| 272 | 272 | // Useful for example for gradients where all browsers use the "background-image" property |
@@ -275,15 +275,15 @@ discard block |
||
| 275 | 275 | 'background-image', |
| 276 | 276 | 'background', |
| 277 | 277 | ); |
| 278 | - if ( in_array( $output['property'], $accepts_multiple, true ) ) { |
|
| 279 | - if ( isset( $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] ) && ! is_array( $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] ) ) { |
|
| 280 | - $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = (array) $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ]; |
|
| 278 | + if ( in_array( $output[ 'property' ], $accepts_multiple, true ) ) { |
|
| 279 | + if ( isset( $this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ $output[ 'property' ] ] ) && ! is_array( $this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ $output[ 'property' ] ] ) ) { |
|
| 280 | + $this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ $output[ 'property' ] ] = (array) $this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ $output[ 'property' ] ]; |
|
| 281 | 281 | } |
| 282 | - $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ][] = $output['prefix'] . $value . $output['units'] . $output['suffix']; |
|
| 282 | + $this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ $output[ 'property' ] ][ ] = $output[ 'prefix' ] . $value . $output[ 'units' ] . $output[ 'suffix' ]; |
|
| 283 | 283 | return; |
| 284 | 284 | } |
| 285 | 285 | if ( is_string( $value ) || is_numeric( $value ) ) { |
| 286 | - $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = $output['prefix'] . $this->process_property_value( $output['property'], $value ) . $output['units'] . $output['suffix']; |
|
| 286 | + $this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ $output[ 'property' ] ] = $output[ 'prefix' ] . $this->process_property_value( $output[ 'property' ], $value ) . $output[ 'units' ] . $output[ 'suffix' ]; |
|
| 287 | 287 | } |
| 288 | 288 | } |
| 289 | 289 | |
@@ -322,8 +322,8 @@ discard block |
||
| 322 | 322 | * @return string|array |
| 323 | 323 | */ |
| 324 | 324 | protected function process_value( $value, $output ) { |
| 325 | - if ( isset( $output['property'] ) ) { |
|
| 326 | - return $this->process_property_value( $output['property'], $value ); |
|
| 325 | + if ( isset( $output[ 'property' ] ) ) { |
|
| 326 | + return $this->process_property_value( $output[ 'property' ], $value ); |
|
| 327 | 327 | } |
| 328 | 328 | return $value; |
| 329 | 329 | } |
@@ -38,7 +38,7 @@ |
||
| 38 | 38 | |
| 39 | 39 | // We're using a flat select. |
| 40 | 40 | foreach ( $this->choices as $key => $args ) { |
| 41 | - $this->choices[ $key ] = $args['label']; |
|
| 41 | + $this->choices[ $key ] = $args[ 'label' ]; |
|
| 42 | 42 | } |
| 43 | 43 | } |
| 44 | 44 | } |
@@ -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 | /** |