@@ -169,18 +169,18 @@ |
||
169 | 169 | */ |
170 | 170 | public function loop_fields( $config_id ) { |
171 | 171 | foreach ( Kirki::$fields as $field ) { |
172 | - if ( isset( $field['kirki_config'] ) && $config_id !== $field['kirki_config'] ) { |
|
172 | + if ( isset( $field[ 'kirki_config' ] ) && $config_id !== $field[ 'kirki_config' ] ) { |
|
173 | 173 | continue; |
174 | 174 | } |
175 | 175 | if ( true === apply_filters( "kirki_{$config_id}_webfonts_skip_hidden", true ) ) { |
176 | 176 | // Only continue if field dependencies are met. |
177 | - if ( ! empty( $field['required'] ) ) { |
|
177 | + if ( ! empty( $field[ 'required' ] ) ) { |
|
178 | 178 | $valid = true; |
179 | 179 | |
180 | - foreach ( $field['required'] as $requirement ) { |
|
181 | - if ( isset( $requirement['setting'] ) && isset( $requirement['value'] ) && isset( $requirement['operator'] ) ) { |
|
182 | - $controller_value = Kirki_Values::get_value( $config_id, $requirement['setting'] ); |
|
183 | - if ( ! Kirki_Helper::compare_values( $controller_value, $requirement['value'], $requirement['operator'] ) ) { |
|
180 | + foreach ( $field[ 'required' ] as $requirement ) { |
|
181 | + if ( isset( $requirement[ 'setting' ] ) && isset( $requirement[ 'value' ] ) && isset( $requirement[ 'operator' ] ) ) { |
|
182 | + $controller_value = Kirki_Values::get_value( $config_id, $requirement[ 'setting' ] ); |
|
183 | + if ( ! Kirki_Helper::compare_values( $controller_value, $requirement[ 'value' ], $requirement[ 'operator' ] ) ) { |
|
184 | 184 | $valid = false; |
185 | 185 | } |
186 | 186 | } |
@@ -146,10 +146,10 @@ discard block |
||
146 | 146 | public static function css( $field ) { |
147 | 147 | |
148 | 148 | // Set class vars. |
149 | - self::$settings = $field['settings']; |
|
150 | - self::$callback = $field['sanitize_callback']; |
|
151 | - self::$field_type = $field['type']; |
|
152 | - self::$output = $field['output']; |
|
149 | + self::$settings = $field[ 'settings' ]; |
|
150 | + self::$callback = $field[ 'sanitize_callback' ]; |
|
151 | + self::$field_type = $field[ 'type' ]; |
|
152 | + self::$output = $field[ 'output' ]; |
|
153 | 153 | if ( ! is_array( self::$output ) ) { |
154 | 154 | self::$output = array( |
155 | 155 | array( |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | |
165 | 165 | // Find the class that will handle the outpout for this field. |
166 | 166 | $classname = 'Kirki_Output'; |
167 | - $field_output_classes = apply_filters( "kirki_{$field['kirki_config']}_output_control_classnames", array( |
|
167 | + $field_output_classes = apply_filters( "kirki_{$field[ 'kirki_config' ]}_output_control_classnames", array( |
|
168 | 168 | 'kirki-background' => 'Kirki_Output_Field_Background', |
169 | 169 | 'kirki-dimensions' => 'Kirki_Output_Field_Dimensions', |
170 | 170 | 'kirki-image' => 'Kirki_Output_Field_Image', |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | if ( array_key_exists( self::$field_type, $field_output_classes ) ) { |
175 | 175 | $classname = $field_output_classes[ self::$field_type ]; |
176 | 176 | } |
177 | - $obj = new $classname( $field['kirki_config'], self::$output, self::$value, $field ); |
|
177 | + $obj = new $classname( $field[ 'kirki_config' ], self::$output, self::$value, $field ); |
|
178 | 178 | return $obj->get_styles(); |
179 | 179 | |
180 | 180 | } |
@@ -119,12 +119,12 @@ discard block |
||
119 | 119 | |
120 | 120 | $config = apply_filters( 'kirki_config', array() ); |
121 | 121 | $priority = 999; |
122 | - if ( isset( $config['styles_priority'] ) ) { |
|
123 | - $priority = absint( $config['styles_priority'] ); |
|
122 | + if ( isset( $config[ 'styles_priority' ] ) ) { |
|
123 | + $priority = absint( $config[ 'styles_priority' ] ); |
|
124 | 124 | } |
125 | 125 | |
126 | 126 | // Allow completely disabling Kirki CSS output. |
127 | - if ( ( defined( 'KIRKI_NO_OUTPUT' ) && true === KIRKI_NO_OUTPUT ) || ( isset( $config['disable_output'] ) && true === $config['disable_output'] ) ) { |
|
127 | + if ( ( defined( 'KIRKI_NO_OUTPUT' ) && true === KIRKI_NO_OUTPUT ) || ( isset( $config[ 'disable_output' ] ) && true === $config[ 'disable_output' ] ) ) { |
|
128 | 128 | return; |
129 | 129 | } |
130 | 130 | |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | |
156 | 156 | // If we are in the customizer, load CSS using inline-styles. |
157 | 157 | // If we are in the frontend AND self::$ajax is true, then load dynamic CSS using AJAX. |
158 | - if ( ( true === self::$ajax ) || ( isset( $config['inline_css'] ) && false === $config['inline_css'] ) ) { |
|
158 | + if ( ( true === self::$ajax ) || ( isset( $config[ 'inline_css' ] ) && false === $config[ 'inline_css' ] ) ) { |
|
159 | 159 | add_action( 'wp_enqueue_scripts', array( $this, 'frontend_styles' ), $priority ); |
160 | 160 | add_action( 'wp_ajax_kirki_dynamic_css', array( $this, 'ajax_dynamic_css' ) ); |
161 | 161 | add_action( 'wp_ajax_nopriv_kirki_dynamic_css', array( $this, 'ajax_dynamic_css' ) ); |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | $configs = Kirki::$config; |
187 | 187 | if ( ! $this->processed ) { |
188 | 188 | foreach ( $configs as $config_id => $args ) { |
189 | - if ( isset( $args['disable_output'] ) && true === $args['disable_output'] ) { |
|
189 | + if ( isset( $args[ 'disable_output' ] ) && true === $args[ 'disable_output' ] ) { |
|
190 | 190 | continue; |
191 | 191 | } |
192 | 192 | $styles = self::loop_controls( $config_id ); |
@@ -243,19 +243,19 @@ discard block |
||
243 | 243 | foreach ( $fields as $field ) { |
244 | 244 | |
245 | 245 | // Only process fields that belong to $config_id. |
246 | - if ( $config_id !== $field['kirki_config'] ) { |
|
246 | + if ( $config_id !== $field[ 'kirki_config' ] ) { |
|
247 | 247 | continue; |
248 | 248 | } |
249 | 249 | |
250 | 250 | if ( true === apply_filters( "kirki_{$config_id}_css_skip_hidden", true ) ) { |
251 | 251 | // Only continue if field dependencies are met. |
252 | - if ( ! empty( $field['required'] ) ) { |
|
252 | + if ( ! empty( $field[ 'required' ] ) ) { |
|
253 | 253 | $valid = true; |
254 | 254 | |
255 | - foreach ( $field['required'] as $requirement ) { |
|
256 | - if ( isset( $requirement['setting'] ) && isset( $requirement['value'] ) && isset( $requirement['operator'] ) ) { |
|
257 | - $controller_value = Kirki_Values::get_value( $config_id, $requirement['setting'] ); |
|
258 | - if ( ! Kirki_Helper::compare_values( $controller_value, $requirement['value'], $requirement['operator'] ) ) { |
|
255 | + foreach ( $field[ 'required' ] as $requirement ) { |
|
256 | + if ( isset( $requirement[ 'setting' ] ) && isset( $requirement[ 'value' ] ) && isset( $requirement[ 'operator' ] ) ) { |
|
257 | + $controller_value = Kirki_Values::get_value( $config_id, $requirement[ 'setting' ] ); |
|
258 | + if ( ! Kirki_Helper::compare_values( $controller_value, $requirement[ 'value' ], $requirement[ 'operator' ] ) ) { |
|
259 | 259 | $valid = false; |
260 | 260 | } |
261 | 261 | } |
@@ -268,7 +268,7 @@ discard block |
||
268 | 268 | } |
269 | 269 | |
270 | 270 | // Only continue if $field['output'] is set. |
271 | - if ( isset( $field['output'] ) && ! empty( $field['output'] ) ) { |
|
271 | + if ( isset( $field[ 'output' ] ) && ! empty( $field[ 'output' ] ) ) { |
|
272 | 272 | $css = Kirki_Helper::array_replace_recursive( $css, Kirki_Modules_CSS_Generator::css( $field ) ); |
273 | 273 | |
274 | 274 | // Add the globals. |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | $config_ids = Kirki_Config::get_config_ids(); |
54 | 54 | global $kirki_deprecated_filters_iteration; |
55 | 55 | foreach ( $config_ids as $config_id ) { |
56 | - foreach( array( |
|
56 | + foreach ( array( |
|
57 | 57 | '/dynamic_css', |
58 | 58 | '/output/control-classnames', |
59 | 59 | '/css/skip_hidden', |
@@ -64,8 +64,8 @@ discard block |
||
64 | 64 | $kirki_deprecated_filters_iteration = array( $config_id, $filter_suffix ); |
65 | 65 | add_filter( "kirki_{$config_id}_{$filter_suffix}", function( $args ) { |
66 | 66 | global $kirki_deprecated_filters_iteration; |
67 | - $kirki_deprecated_filters_iteration[1] = str_replace( '-', '_', $kirki_deprecated_filters_iteration[1] ); |
|
68 | - return apply_filters( "kirki/{$kirki_deprecated_filters_iteration[0]}/{$kirki_deprecated_filters_iteration[1]}", $args ); |
|
67 | + $kirki_deprecated_filters_iteration[ 1 ] = str_replace( '-', '_', $kirki_deprecated_filters_iteration[ 1 ] ); |
|
68 | + return apply_filters( "kirki/{$kirki_deprecated_filters_iteration[ 0 ]}/{$kirki_deprecated_filters_iteration[ 1 ]}", $args ); |
|
69 | 69 | }, 99 ); |
70 | 70 | } |
71 | 71 | } |
@@ -1,55 +1,68 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | // @codingStandardsIgnoreFile |
3 | 3 | |
4 | -add_filter( 'kirki_config', function( $args ) { |
|
4 | +add_filter( 'kirki_config', function( $args ) |
|
5 | +{ |
|
5 | 6 | return apply_filters( 'kirki/config', $args ); |
6 | 7 | }, 99 ); |
7 | 8 | |
8 | -add_filter( 'kirki_control_types', function( $args ) { |
|
9 | +add_filter( 'kirki_control_types', function( $args ) |
|
10 | +{ |
|
9 | 11 | return apply_filters( 'kirki/control_types', $args ); |
10 | 12 | }, 99 ); |
11 | 13 | |
12 | -add_filter( 'kirki_section_types', function( $args ) { |
|
14 | +add_filter( 'kirki_section_types', function( $args ) |
|
15 | +{ |
|
13 | 16 | return apply_filters( 'kirki/section_types', $args ); |
14 | 17 | }, 99 ); |
15 | 18 | |
16 | -add_filter( 'kirki_section_types_exclude', function( $args ) { |
|
19 | +add_filter( 'kirki_section_types_exclude', function( $args ) |
|
20 | +{ |
|
17 | 21 | return apply_filters( 'kirki/section_types/exclude', $args ); |
18 | 22 | }, 99 ); |
19 | 23 | |
20 | -add_filter( 'kirki_control_types_exclude', function( $args ) { |
|
24 | +add_filter( 'kirki_control_types_exclude', function( $args ) |
|
25 | +{ |
|
21 | 26 | return apply_filters( 'kirki/control_types/exclude', $args ); |
22 | 27 | }, 99 ); |
23 | 28 | |
24 | -add_filter( 'kirki_controls', function( $args ) { |
|
29 | +add_filter( 'kirki_controls', function( $args ) |
|
30 | +{ |
|
25 | 31 | return apply_filters( 'kirki/controls', $args ); |
26 | 32 | }, 99 ); |
27 | 33 | |
28 | -add_filter( 'kirki_fields', function( $args ) { |
|
34 | +add_filter( 'kirki_fields', function( $args ) |
|
35 | +{ |
|
29 | 36 | return apply_filters( 'kirki/fields', $args ); |
30 | 37 | }, 99 ); |
31 | 38 | |
32 | -add_filter( 'kirki_modules', function( $args ) { |
|
39 | +add_filter( 'kirki_modules', function( $args ) |
|
40 | +{ |
|
33 | 41 | return apply_filters( 'kirki/modules', $args ); |
34 | 42 | }, 99 ); |
35 | 43 | |
36 | -add_filter( 'kirki_panel_types', function( $args ) { |
|
44 | +add_filter( 'kirki_panel_types', function( $args ) |
|
45 | +{ |
|
37 | 46 | return apply_filters( 'kirki/panel_types', $args ); |
38 | 47 | }, 99 ); |
39 | 48 | |
40 | -add_filter( 'kirki_setting_types', function( $args ) { |
|
49 | +add_filter( 'kirki_setting_types', function( $args ) |
|
50 | +{ |
|
41 | 51 | return apply_filters( 'kirki/setting_types', $args ); |
42 | 52 | }, 99 ); |
43 | 53 | |
44 | -add_filter( 'kirki_variable', function( $args ) { |
|
54 | +add_filter( 'kirki_variable', function( $args ) |
|
55 | +{ |
|
45 | 56 | return apply_filters( 'kirki/variable', $args ); |
46 | 57 | }, 99 ); |
47 | 58 | |
48 | -add_filter( 'kirki_values_get_value', function( $arg1, $arg2 ) { |
|
59 | +add_filter( 'kirki_values_get_value', function( $arg1, $arg2 ) |
|
60 | +{ |
|
49 | 61 | return apply_filters( 'kirki/values/get_value', $arg1, $arg2 ); |
50 | 62 | }, 99, 2 ); |
51 | 63 | |
52 | -add_action( 'init', function() { |
|
64 | +add_action( 'init', function() |
|
65 | +{ |
|
53 | 66 | $config_ids = Kirki_Config::get_config_ids(); |
54 | 67 | global $kirki_deprecated_filters_iteration; |
55 | 68 | foreach ( $config_ids as $config_id ) { |
@@ -62,7 +75,8 @@ discard block |
||
62 | 75 | '/webfonts/skip_hidden', |
63 | 76 | ) as $filter_suffix ) { |
64 | 77 | $kirki_deprecated_filters_iteration = array( $config_id, $filter_suffix ); |
65 | - add_filter( "kirki_{$config_id}_{$filter_suffix}", function( $args ) { |
|
78 | + add_filter( "kirki_{$config_id}_{$filter_suffix}", function( $args ) |
|
79 | + { |
|
66 | 80 | global $kirki_deprecated_filters_iteration; |
67 | 81 | $kirki_deprecated_filters_iteration[1] = str_replace( '-', '_', $kirki_deprecated_filters_iteration[1] ); |
68 | 82 | return apply_filters( "kirki/{$kirki_deprecated_filters_iteration[0]}/{$kirki_deprecated_filters_iteration[1]}", $args ); |
@@ -71,38 +85,47 @@ discard block |
||
71 | 85 | } |
72 | 86 | }, 99 ); |
73 | 87 | |
74 | -add_filter( 'kirki_enqueue_google_fonts', function( $args ) { |
|
88 | +add_filter( 'kirki_enqueue_google_fonts', function( $args ) |
|
89 | +{ |
|
75 | 90 | return apply_filters( 'kirki/enqueue_google_fonts', $args ); |
76 | 91 | }, 99 ); |
77 | 92 | |
78 | -add_filter( 'kirki_styles_array', function( $args ) { |
|
93 | +add_filter( 'kirki_styles_array', function( $args ) |
|
94 | +{ |
|
79 | 95 | return apply_filters( 'kirki/styles_array', $args ); |
80 | 96 | }, 99 ); |
81 | 97 | |
82 | -add_filter( 'kirki_dynamic_css_method', function( $args ) { |
|
98 | +add_filter( 'kirki_dynamic_css_method', function( $args ) |
|
99 | +{ |
|
83 | 100 | return apply_filters( 'kirki/dynamic_css/method', $args ); |
84 | 101 | }, 99 ); |
85 | 102 | |
86 | -add_filter( 'kirki_postmessage_script', function( $args ) { |
|
103 | +add_filter( 'kirki_postmessage_script', function( $args ) |
|
104 | +{ |
|
87 | 105 | return apply_filters( 'kirki/postmessage/script', $args ); |
88 | 106 | }, 99 ); |
89 | 107 | |
90 | -add_filter( 'kirki_fonts_all', function( $args ) { |
|
108 | +add_filter( 'kirki_fonts_all', function( $args ) |
|
109 | +{ |
|
91 | 110 | return apply_filters( 'kirki/fonts/all', $args ); |
92 | 111 | }, 99 ); |
93 | 112 | |
94 | -add_filter( 'kirki_fonts_standard_fonts', function( $args ) { |
|
113 | +add_filter( 'kirki_fonts_standard_fonts', function( $args ) |
|
114 | +{ |
|
95 | 115 | return apply_filters( 'kirki/fonts/standard_fonts', $args ); |
96 | 116 | }, 99 ); |
97 | 117 | |
98 | -add_filter( 'kirki_fonts_backup_fonts', function( $args ) { |
|
118 | +add_filter( 'kirki_fonts_backup_fonts', function( $args ) |
|
119 | +{ |
|
99 | 120 | return apply_filters( 'kirki/fonts/backup_fonts', $args ); |
100 | 121 | }, 99 ); |
101 | 122 | |
102 | -add_filter( 'kirki_fonts_google_fonts', function( $args ) { |
|
123 | +add_filter( 'kirki_fonts_google_fonts', function( $args ) |
|
124 | +{ |
|
103 | 125 | return apply_filters( 'kirki/fonts/google_fonts', $args ); |
104 | 126 | }, 99 ); |
105 | 127 | |
106 | -add_filter( 'kirki_googlefonts_load_method', function( $args ) { |
|
128 | +add_filter( 'kirki_googlefonts_load_method', function( $args ) |
|
129 | +{ |
|
107 | 130 | return apply_filters( 'kirki/googlefonts_load_method', $args ); |
108 | 131 | }, 99 ); |