|
@@ -101,19 +101,19 @@ discard block |
|
|
block discarded – undo |
|
101
|
101
|
$value = str_replace( '$', $value, $output['value_pattern'] ); |
|
102
|
102
|
} |
|
103
|
103
|
if ( is_array( $value ) ) { |
|
104
|
|
- if ( isset( $output['choice'] ) && isset( $value[ $output['choice'] ] ) ) { |
|
105
|
|
- $value[ $output['choice'] ] = str_replace( '$', $value[ $output['choice'] ], $output['value_pattern'] ); |
|
|
104
|
+ if ( isset( $output['choice'] ) && isset( $value[$output['choice']] ) ) { |
|
|
105
|
+ $value[$output['choice']] = str_replace( '$', $value[$output['choice']], $output['value_pattern'] ); |
|
106
|
106
|
} else { |
|
107
|
107
|
foreach ( $value as $k => $v ) { |
|
108
|
|
- $value[ $k ] = str_replace( '$', $value[ $k ], $output['value_pattern'] ); |
|
|
108
|
+ $value[$k] = str_replace( '$', $value[$k], $output['value_pattern'] ); |
|
109
|
109
|
} |
|
110
|
110
|
} |
|
111
|
111
|
} |
|
112
|
112
|
if ( isset( $output['pattern_replace'] ) && is_array( $output['pattern_replace'] ) ) { |
|
113
|
113
|
$option_type = 'theme_mod'; |
|
114
|
114
|
$option_name = false; |
|
115
|
|
- if ( isset( Kirki::$config[ $this->config_id ] ) ) { |
|
116
|
|
- $config = Kirki::$config[ $this->config_id ]; |
|
|
115
|
+ if ( isset( Kirki::$config[$this->config_id] ) ) { |
|
|
116
|
+ $config = Kirki::$config[$this->config_id]; |
|
117
|
117
|
$option_type = ( isset( $config['option_type'] ) ) ? $config['option_type'] : 'theme_mod'; |
|
118
|
118
|
if ( 'option' === $option_type || 'site_option' === $option_type ) { |
|
119
|
119
|
$option_name = ( isset( $config['option_name'] ) ) ? $config['option_name'] : false; |
|
@@ -130,16 +130,16 @@ discard block |
|
|
block discarded – undo |
|
130
|
130
|
if ( is_array( $options ) ) { |
|
131
|
131
|
if ( $option_name ) { |
|
132
|
132
|
$subkey = str_replace( array( $option_name, '[', ']' ), '', $replace ); |
|
133
|
|
- $replacement = ( isset( $options[ $subkey ] ) ) ? $options[ $subkey ] : ''; |
|
|
133
|
+ $replacement = ( isset( $options[$subkey] ) ) ? $options[$subkey] : ''; |
|
134
|
134
|
break; |
|
135
|
135
|
} |
|
136
|
|
- $replacement = ( isset( $options[ $replace ] ) ) ? $options[ $replace ] : ''; |
|
|
136
|
+ $replacement = ( isset( $options[$replace] ) ) ? $options[$replace] : ''; |
|
137
|
137
|
break; |
|
138
|
138
|
} |
|
139
|
139
|
$replacement = get_option( $replace ); |
|
140
|
140
|
break; |
|
141
|
141
|
case 'site_option': |
|
142
|
|
- $replacement = ( is_array( $options ) && isset( $options[ $replace ] ) ) ? $options[ $replace ] : get_site_option( $replace ); |
|
|
142
|
+ $replacement = ( is_array( $options ) && isset( $options[$replace] ) ) ? $options[$replace] : get_site_option( $replace ); |
|
143
|
143
|
break; |
|
144
|
144
|
case 'user_meta': |
|
145
|
145
|
$user_id = get_current_user_id(); |
|
@@ -154,7 +154,7 @@ discard block |
|
|
block discarded – undo |
|
154
|
154
|
$replacement = ( false === $replacement ) ? '' : $replacement; |
|
155
|
155
|
if ( is_array( $value ) ) { |
|
156
|
156
|
foreach ( $value as $k => $v ) { |
|
157
|
|
- $value[ $k ] = str_replace( $search, $replacement, $value[ $v ] ); |
|
|
157
|
+ $value[$k] = str_replace( $search, $replacement, $value[$v] ); |
|
158
|
158
|
} |
|
159
|
159
|
return $value; |
|
160
|
160
|
} |
|
@@ -199,7 +199,7 @@ discard block |
|
|
block discarded – undo |
|
199
|
199
|
} |
|
200
|
200
|
// If 'choice' is defined check for sub-values too. |
|
201
|
201
|
// Fixes https://github.com/aristath/kirki/issues/1416. |
|
202
|
|
- if ( isset( $output['choice'] ) && isset( $value[ $output['choice'] ] ) && $exclude == $value[ $output['choice'] ] ) { |
|
|
202
|
+ if ( isset( $output['choice'] ) && isset( $value[$output['choice']] ) && $exclude == $value[$output['choice']] ) { |
|
203
|
203
|
$skip = true; |
|
204
|
204
|
} |
|
205
|
205
|
} |
|
@@ -257,13 +257,13 @@ discard block |
|
|
block discarded – undo |
|
257
|
257
|
'background', |
|
258
|
258
|
); |
|
259
|
259
|
if ( in_array( $output['property'], $accepts_multiple, true ) ) { |
|
260
|
|
- if ( isset( $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] ) && ! is_array( $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] ) ) { |
|
261
|
|
- $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = (array) $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ]; |
|
|
260
|
+ if ( isset( $this->styles[$output['media_query']][$output['element']][$output['property']] ) && ! is_array( $this->styles[$output['media_query']][$output['element']][$output['property']] ) ) { |
|
|
261
|
+ $this->styles[$output['media_query']][$output['element']][$output['property']] = (array) $this->styles[$output['media_query']][$output['element']][$output['property']]; |
|
262
|
262
|
} |
|
263
|
|
- $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ][] = $output['prefix'] . $value . $output['units'] . $output['suffix']; |
|
|
263
|
+ $this->styles[$output['media_query']][$output['element']][$output['property']][] = $output['prefix'] . $value . $output['units'] . $output['suffix']; |
|
264
|
264
|
return; |
|
265
|
265
|
} |
|
266
|
|
- $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = $output['prefix'] . $value . $output['units'] . $output['suffix']; |
|
|
266
|
+ $this->styles[$output['media_query']][$output['element']][$output['property']] = $output['prefix'] . $value . $output['units'] . $output['suffix']; |
|
267
|
267
|
} |
|
268
|
268
|
|
|
269
|
269
|
/** |
|
@@ -283,7 +283,7 @@ discard block |
|
|
block discarded – undo |
|
283
|
283
|
'background-position' => 'Kirki_Output_Property_Background_Position', |
|
284
|
284
|
) ); |
|
285
|
285
|
if ( array_key_exists( $property, $properties ) ) { |
|
286
|
|
- $classname = $properties[ $property ]; |
|
|
286
|
+ $classname = $properties[$property]; |
|
287
|
287
|
$obj = new $classname( $property, $value ); |
|
288
|
288
|
return $obj->get_value(); |
|
289
|
289
|
} |