|
@@ -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(); |
|
@@ -222,9 +222,9 @@ discard block |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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
|
} |