@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | 'kirki-multicolor' => 'Kirki_Output_Field_Multicolor', |
172 | 172 | ) ); |
173 | 173 | if ( array_key_exists( self::$field_type, $field_output_classes ) ) { |
174 | - $classname = $field_output_classes[ self::$field_type ]; |
|
174 | + $classname = $field_output_classes[self::$field_type]; |
|
175 | 175 | } |
176 | 176 | $obj = new $classname( $field['kirki_config'], self::$output, self::$value ); |
177 | 177 | return $obj->get_styles(); |
@@ -235,10 +235,10 @@ discard block |
||
235 | 235 | 'transition', |
236 | 236 | 'transition-property', |
237 | 237 | ), true ) ) { |
238 | - unset( $css[ $media_query ][ $element ][ $property ] ); |
|
239 | - $css[ $media_query ][ $element ][ '-webkit-' . $property ] = $value; |
|
240 | - $css[ $media_query ][ $element ][ '-moz-' . $property ] = $value; |
|
241 | - $css[ $media_query ][ $element ][ $property ] = $value; |
|
238 | + unset( $css[$media_query][$element][$property] ); |
|
239 | + $css[$media_query][$element]['-webkit-' . $property] = $value; |
|
240 | + $css[$media_query][$element]['-moz-' . $property] = $value; |
|
241 | + $css[$media_query][$element][$property] = $value; |
|
242 | 242 | } |
243 | 243 | |
244 | 244 | // Add -ms-* and -o-*. |
@@ -248,10 +248,10 @@ discard block |
||
248 | 248 | 'transition', |
249 | 249 | 'transition-property', |
250 | 250 | ), true ) ) { |
251 | - unset( $css[ $media_query ][ $element ][ $property ] ); |
|
252 | - $css[ $media_query ][ $element ][ '-ms-' . $property ] = $value; |
|
253 | - $css[ $media_query ][ $element ][ '-o-' . $property ] = $value; |
|
254 | - $css[ $media_query ][ $element ][ $property ] = $value; |
|
251 | + unset( $css[$media_query][$element][$property] ); |
|
252 | + $css[$media_query][$element]['-ms-' . $property] = $value; |
|
253 | + $css[$media_query][$element]['-o-' . $property] = $value; |
|
254 | + $css[$media_query][$element][$property] = $value; |
|
255 | 255 | } |
256 | 256 | } |
257 | 257 | } |
@@ -88,10 +88,10 @@ discard block |
||
88 | 88 | $js_var['index_key'] = $key; |
89 | 89 | $callback = $this->get_callback( $args ); |
90 | 90 | if ( is_callable( $callback ) ) { |
91 | - $field['scripts'][ $key ] = call_user_func_array( $callback, array( $js_var, $args ) ); |
|
91 | + $field['scripts'][$key] = call_user_func_array( $callback, array( $js_var, $args ) ); |
|
92 | 92 | continue; |
93 | 93 | } |
94 | - $field['scripts'][ $key ] = $this->script_var( $js_var ); |
|
94 | + $field['scripts'][$key] = $this->script_var( $js_var ); |
|
95 | 95 | } |
96 | 96 | $combo_extra_script = ''; |
97 | 97 | $combo_css_script = ''; |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | 'font-weight' => 'fontWeight', |
267 | 267 | 'font-style' => 'fontStyle', |
268 | 268 | ); |
269 | - $choice_condition = ( isset( $args['choice'] ) && '' !== $args['choice'] && isset( $css_build_array[ $args['choice'] ] ) ); |
|
269 | + $choice_condition = ( isset( $args['choice'] ) && '' !== $args['choice'] && isset( $css_build_array[$args['choice']] ) ); |
|
270 | 270 | $script .= ( ! $choice_condition ) ? $webfont_loader : ''; |
271 | 271 | foreach ( $css_build_array as $property => $var ) { |
272 | 272 | if ( $choice_condition && $property !== $args['choice'] ) { |
@@ -337,7 +337,7 @@ discard block |
||
337 | 337 | 'units' => '', |
338 | 338 | 'js_callback' => array( '', '' ), |
339 | 339 | 'value_pattern' => '', |
340 | - )); |
|
340 | + ) ); |
|
341 | 341 | |
342 | 342 | // Element should be a string. |
343 | 343 | if ( is_array( $args['element'] ) ) { |
@@ -49,50 +49,37 @@ |
||
49 | 49 | $back_obj = ( $back ) ? ariColor::newColor( $back ) : false; |
50 | 50 | if ( $back ) { |
51 | 51 | $text_on_back = ( 60 > $back_obj->lightness ) ? |
52 | - $back_obj->getNew( 'lightness', $back_obj->lightness + 60 )->toCSS( $back_obj->mode ) : |
|
53 | - $back_obj->getNew( 'lightness', $back_obj->lightness - 60 )->toCSS( $back_obj->mode ); |
|
52 | + $back_obj->getNew( 'lightness', $back_obj->lightness + 60 )->toCSS( $back_obj->mode ) : $back_obj->getNew( 'lightness', $back_obj->lightness - 60 )->toCSS( $back_obj->mode ); |
|
54 | 53 | $border_on_back = ( 80 < $back_obj->lightness ) ? |
55 | - $back_obj->getNew( 'lightness', $back_obj->lightness - 13 )->toCSS( $back_obj->mode ) : |
|
56 | - $back_obj->getNew( 'lightness', $back_obj->lightness + 13 )->toCSS( $back_obj->mode ); |
|
54 | + $back_obj->getNew( 'lightness', $back_obj->lightness - 13 )->toCSS( $back_obj->mode ) : $back_obj->getNew( 'lightness', $back_obj->lightness + 13 )->toCSS( $back_obj->mode ); |
|
57 | 55 | $back_on_back = ( 90 < $back_obj->lightness ) ? |
58 | - $back_obj->getNew( 'lightness', $back_obj->lightness - 6 )->toCSS( $back_obj->mode ) : |
|
59 | - $back_obj->getNew( 'lightness', $back_obj->lightness + 11 )->toCSS( $back_obj->mode ); |
|
56 | + $back_obj->getNew( 'lightness', $back_obj->lightness - 6 )->toCSS( $back_obj->mode ) : $back_obj->getNew( 'lightness', $back_obj->lightness + 11 )->toCSS( $back_obj->mode ); |
|
60 | 57 | $hover_on_back = ( 90 < $back_obj->lightness ) ? |
61 | - $back_obj->getNew( 'lightness', $back_obj->lightness - 3 )->toCSS( $back_obj->mode ) : |
|
62 | - $back_obj->getNew( 'lightness', $back_obj->lightness + 3 )->toCSS( $back_obj->mode ); |
|
58 | + $back_obj->getNew( 'lightness', $back_obj->lightness - 3 )->toCSS( $back_obj->mode ) : $back_obj->getNew( 'lightness', $back_obj->lightness + 3 )->toCSS( $back_obj->mode ); |
|
63 | 59 | $arrows_on_back = ( 50 > $back_obj->lightness ) ? |
64 | - $back_obj->getNew( 'lightness', $back_obj->lightness + 30 )->toCSS( $back_obj->mode ) : |
|
65 | - $back_obj->getNew( 'lightness', $back_obj->lightness - 30 )->toCSS( $back_obj->mode ); |
|
60 | + $back_obj->getNew( 'lightness', $back_obj->lightness + 30 )->toCSS( $back_obj->mode ) : $back_obj->getNew( 'lightness', $back_obj->lightness - 30 )->toCSS( $back_obj->mode ); |
|
66 | 61 | $back_disabled_obj = ( 35 < $back_obj->lightness ) ? |
67 | - $back_obj->getNew( 'lightness', $back_obj->lightness - 30 ) : |
|
68 | - $back_obj->getNew( 'lightness', $back_obj->lightness + 30 ); |
|
62 | + $back_obj->getNew( 'lightness', $back_obj->lightness - 30 ) : $back_obj->getNew( 'lightness', $back_obj->lightness + 30 ); |
|
69 | 63 | $back_disabled = $back_disabled_obj->toCSS( $back_disabled_obj->mode ); |
70 | 64 | $text_on_back_disabled = ( 60 > $back_disabled_obj->lightness ) ? |
71 | - $back_disabled_obj->getNew( 'lightness', $back_disabled_obj->lightness + 60 )->toCSS( $back_disabled_obj->mode ) : |
|
72 | - $back_disabled_obj->getNew( 'lightness', $back_disabled_obj->lightness - 60 )->toCSS( $back_disabled_obj->mode ); |
|
65 | + $back_disabled_obj->getNew( 'lightness', $back_disabled_obj->lightness + 60 )->toCSS( $back_disabled_obj->mode ) : $back_disabled_obj->getNew( 'lightness', $back_disabled_obj->lightness - 60 )->toCSS( $back_disabled_obj->mode ); |
|
73 | 66 | $border_on_back_disabled = ( 50 < $back_disabled_obj->lightness ) ? |
74 | - $back_disabled_obj->getNew( 'lightness', $back_disabled_obj->lightness - 4 )->toCSS( $back_disabled_obj->mode ) : |
|
75 | - $back_disabled_obj->getNew( 'lightness', $back_disabled_obj->lightness + 4 )->toCSS( $back_disabled_obj->mode ); |
|
67 | + $back_disabled_obj->getNew( 'lightness', $back_disabled_obj->lightness - 4 )->toCSS( $back_disabled_obj->mode ) : $back_disabled_obj->getNew( 'lightness', $back_disabled_obj->lightness + 4 )->toCSS( $back_disabled_obj->mode ); |
|
76 | 68 | } |
77 | 69 | $accent = ( isset( $config['color_accent'] ) ) ? $config['color_accent'] : false; |
78 | 70 | $accent_obj = ( $accent ) ? ariColor::newColor( $accent ) : false; |
79 | 71 | if ( $accent ) { |
80 | 72 | $text_on_accent = ( 60 > $accent_obj->lightness ) ? |
81 | - $accent_obj->getNew( 'lightness', $accent_obj->lightness + 60 )->toCSS( $accent_obj->mode ) : |
|
82 | - $accent_obj->getNew( 'lightness', $accent_obj->lightness - 60 )->toCSS( $accent_obj->mode ); |
|
73 | + $accent_obj->getNew( 'lightness', $accent_obj->lightness + 60 )->toCSS( $accent_obj->mode ) : $accent_obj->getNew( 'lightness', $accent_obj->lightness - 60 )->toCSS( $accent_obj->mode ); |
|
83 | 74 | $border_on_accent = ( 50 < $accent_obj->lightness ) ? |
84 | - $accent_obj->getNew( 'lightness', $accent_obj->lightness - 4 )->toCSS( $accent_obj->mode ) : |
|
85 | - $accent_obj->getNew( 'lightness', $accent_obj->lightness + 4 )->toCSS( $accent_obj->mode ); |
|
75 | + $accent_obj->getNew( 'lightness', $accent_obj->lightness - 4 )->toCSS( $accent_obj->mode ) : $accent_obj->getNew( 'lightness', $accent_obj->lightness + 4 )->toCSS( $accent_obj->mode ); |
|
86 | 76 | $accent_disabled_obj = ( 35 < $accent_obj->lightness ) ? |
87 | - $accent_obj->getNew( 'lightness', $accent_obj->lightness - 30 ) : |
|
88 | - $accent_obj->getNew( 'lightness', $accent_obj->lightness + 30 ); |
|
77 | + $accent_obj->getNew( 'lightness', $accent_obj->lightness - 30 ) : $accent_obj->getNew( 'lightness', $accent_obj->lightness + 30 ); |
|
89 | 78 | $accent_disabled = $accent_disabled_obj->toCSS( $accent_disabled_obj->mode ); |
90 | 79 | $text_on_accent_disabled = ( 60 > $accent_disabled_obj->lightness ) ? |
91 | - $accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness + 60 )->toCSS( $accent_disabled_obj->mode ) : |
|
92 | - $accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness - 60 )->toCSS( $accent_disabled_obj->mode ); |
|
80 | + $accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness + 60 )->toCSS( $accent_disabled_obj->mode ) : $accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness - 60 )->toCSS( $accent_disabled_obj->mode ); |
|
93 | 81 | $border_on_accent_disabled = ( 50 < $accent_disabled_obj->lightness ) ? |
94 | - $accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness - 4 )->toCSS( $accent_disabled_obj->mode ) : |
|
95 | - $accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness + 4 )->toCSS( $accent_disabled_obj->mode ); |
|
82 | + $accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness - 4 )->toCSS( $accent_disabled_obj->mode ) : $accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness + 4 )->toCSS( $accent_disabled_obj->mode ); |
|
96 | 83 | } |
97 | 84 | |
98 | 85 | if ( $back ) { |
@@ -80,9 +80,9 @@ |
||
80 | 80 | $fonts_to_load = array(); |
81 | 81 | foreach ( $this->googlefonts->fonts as $font => $weights ) { |
82 | 82 | foreach ( $weights as $key => $value ) { |
83 | - $weights[ $key ] = str_replace( array( 'regular', 'bold', 'italic' ), array( '400', '', 'i' ), $value ); |
|
83 | + $weights[$key] = str_replace( array( 'regular', 'bold', 'italic' ), array( '400', '', 'i' ), $value ); |
|
84 | 84 | if ( 'i' === $value ) { |
85 | - $weights[ $key ] = '400i'; |
|
85 | + $weights[$key] = '400i'; |
|
86 | 86 | } |
87 | 87 | } |
88 | 88 | $fonts_to_load[] = $font . ':' . join( ',', $weights ); |
@@ -243,8 +243,8 @@ |
||
243 | 243 | $css = Kirki_Helper::array_replace_recursive( $css, Kirki_Modules_CSS_Generator::css( $field ) ); |
244 | 244 | |
245 | 245 | // Add the globals. |
246 | - if ( isset( self::$css_array[ $config_id ] ) && ! empty( self::$css_array[ $config_id ] ) ) { |
|
247 | - Kirki_Helper::array_replace_recursive( $css, self::$css_array[ $config_id ] ); |
|
246 | + if ( isset( self::$css_array[$config_id] ) && ! empty( self::$css_array[$config_id] ) ) { |
|
247 | + Kirki_Helper::array_replace_recursive( $css, self::$css_array[$config_id] ); |
|
248 | 248 | } |
249 | 249 | } |
250 | 250 | } |
@@ -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(); |
@@ -222,9 +222,9 @@ discard block |
||
222 | 222 | return; |
223 | 223 | } |
224 | 224 | $output['media_query'] = ( isset( $output['media_query'] ) ) ? $output['media_query'] : 'global'; |
225 | - $output['prefix'] = ( isset( $output['prefix'] ) ) ? $output['prefix'] : ''; |
|
226 | - $output['units'] = ( isset( $output['units'] ) ) ? $output['units'] : ''; |
|
227 | - $output['suffix'] = ( isset( $output['suffix'] ) ) ? $output['suffix'] : ''; |
|
225 | + $output['prefix'] = ( isset( $output['prefix'] ) ) ? $output['prefix'] : ''; |
|
226 | + $output['units'] = ( isset( $output['units'] ) ) ? $output['units'] : ''; |
|
227 | + $output['suffix'] = ( isset( $output['suffix'] ) ) ? $output['suffix'] : ''; |
|
228 | 228 | |
229 | 229 | // Properties that can accept multiple values. |
230 | 230 | // Useful for example for gradients where all browsers use the "background-image" property |
@@ -233,13 +233,13 @@ discard block |
||
233 | 233 | 'background-image', |
234 | 234 | ); |
235 | 235 | if ( in_array( $output['property'], $accepts_multiple ) ) { |
236 | - if ( isset( $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] ) && ! is_array( $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] ) ) { |
|
237 | - $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = (array) $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ]; |
|
236 | + if ( isset( $this->styles[$output['media_query']][$output['element']][$output['property']] ) && ! is_array( $this->styles[$output['media_query']][$output['element']][$output['property']] ) ) { |
|
237 | + $this->styles[$output['media_query']][$output['element']][$output['property']] = (array) $this->styles[$output['media_query']][$output['element']][$output['property']]; |
|
238 | 238 | } |
239 | - $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ][] = $output['prefix'] . $value . $output['units'] . $output['suffix']; |
|
239 | + $this->styles[$output['media_query']][$output['element']][$output['property']][] = $output['prefix'] . $value . $output['units'] . $output['suffix']; |
|
240 | 240 | return; |
241 | 241 | } |
242 | - $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = $output['prefix'] . $value . $output['units'] . $output['suffix']; |
|
242 | + $this->styles[$output['media_query']][$output['element']][$output['property']] = $output['prefix'] . $value . $output['units'] . $output['suffix']; |
|
243 | 243 | } |
244 | 244 | |
245 | 245 | /** |
@@ -259,7 +259,7 @@ discard block |
||
259 | 259 | 'background-position' => 'Kirki_Output_Property_Background_Position', |
260 | 260 | ) ); |
261 | 261 | if ( array_key_exists( $property, $properties ) ) { |
262 | - $classname = $properties[ $property ]; |
|
262 | + $classname = $properties[$property]; |
|
263 | 263 | $obj = new $classname( $property, $value ); |
264 | 264 | return $obj->get_value(); |
265 | 265 | } |
@@ -43,8 +43,8 @@ |
||
43 | 43 | // Add backup font. |
44 | 44 | if ( Kirki_Fonts::is_google_font( $family ) ) { |
45 | 45 | |
46 | - if ( '' === $backup && isset( $google_fonts_array[ $family ] ) && isset( $backup_fonts[ $google_fonts_array[ $family ]['category'] ] ) ) { |
|
47 | - $backup = $backup_fonts[ $google_fonts_array[ $family ]['category'] ]; |
|
46 | + if ( '' === $backup && isset( $google_fonts_array[$family] ) && isset( $backup_fonts[$google_fonts_array[$family]['category']] ) ) { |
|
47 | + $backup = $backup_fonts[$google_fonts_array[$family]['category']]; |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | // Add double quotes if needed. |
@@ -47,14 +47,14 @@ discard block |
||
47 | 47 | ); |
48 | 48 | |
49 | 49 | foreach ( $properties as $property ) { |
50 | - if ( ! isset( $value[ $property ] ) || '' === $value[ $property ] ) { |
|
50 | + if ( ! isset( $value[$property] ) || '' === $value[$property] ) { |
|
51 | 51 | continue; |
52 | 52 | } |
53 | 53 | if ( isset( $output['choice'] ) && $output['choice'] !== $property ) { |
54 | 54 | continue; |
55 | 55 | } |
56 | 56 | |
57 | - $property_value = $this->process_property_value( $property, $value[ $property ] ); |
|
57 | + $property_value = $this->process_property_value( $property, $value[$property] ); |
|
58 | 58 | if ( 'font-family' === $property ) { |
59 | 59 | $value['font-backup'] = ( isset( $value['font-backup'] ) ) ? $value['font-backup'] : ''; |
60 | 60 | $property_value = $this->process_property_value( $property, array( |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | $value['font-backup'], |
63 | 63 | ) ); |
64 | 64 | } |
65 | - $this->styles[ $output['media_query'] ][ $output['element'] ][ $property ] = $output['prefix'] . $property_value . $output['suffix']; |
|
65 | + $this->styles[$output['media_query']][$output['element']][$property] = $output['prefix'] . $property_value . $output['suffix']; |
|
66 | 66 | } |
67 | 67 | } |
68 | 68 | } |