|
@@ -102,8 +102,8 @@ discard block |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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
|
} |