|
@@ -103,16 +103,16 @@ discard block |
|
|
block discarded – undo |
|
103
|
103
|
} |
|
104
|
104
|
if ( is_array( $value ) ) { |
|
105
|
105
|
foreach ( array_keys( $value ) as $value_k ) { |
|
106
|
|
- if ( ! is_string( $value[ $value_k ] ) ) { |
|
|
106
|
+ if ( ! is_string( $value[$value_k] ) ) { |
|
107
|
107
|
continue; |
|
108
|
108
|
} |
|
109
|
109
|
if ( isset( $output['choice'] ) ) { |
|
110
|
110
|
if ( $output['choice'] === $value_k ) { |
|
111
|
|
- $value[ $output['choice'] ] = str_replace( '$', $value[ $output['choice'] ], $output['value_pattern'] ); |
|
|
111
|
+ $value[$output['choice']] = str_replace( '$', $value[$output['choice']], $output['value_pattern'] ); |
|
112
|
112
|
} |
|
113
|
113
|
continue; |
|
114
|
114
|
} |
|
115
|
|
- $value[ $value_k ] = str_replace( '$', $value[ $value_k ], $output['value_pattern'] ); |
|
|
115
|
+ $value[$value_k] = str_replace( '$', $value[$value_k], $output['value_pattern'] ); |
|
116
|
116
|
} |
|
117
|
117
|
} |
|
118
|
118
|
$value = $this->apply_pattern_replace( $output, $value ); |
|
@@ -142,16 +142,16 @@ discard block |
|
|
block discarded – undo |
|
142
|
142
|
if ( is_array( $options ) ) { |
|
143
|
143
|
if ( $option_name ) { |
|
144
|
144
|
$subkey = str_replace( array( $option_name, '[', ']' ), '', $replace ); |
|
145
|
|
- $replacement = ( isset( $options[ $subkey ] ) ) ? $options[ $subkey ] : ''; |
|
|
145
|
+ $replacement = ( isset( $options[$subkey] ) ) ? $options[$subkey] : ''; |
|
146
|
146
|
break; |
|
147
|
147
|
} |
|
148
|
|
- $replacement = ( isset( $options[ $replace ] ) ) ? $options[ $replace ] : ''; |
|
|
148
|
+ $replacement = ( isset( $options[$replace] ) ) ? $options[$replace] : ''; |
|
149
|
149
|
break; |
|
150
|
150
|
} |
|
151
|
151
|
$replacement = get_option( $replace ); |
|
152
|
152
|
break; |
|
153
|
153
|
case 'site_option': |
|
154
|
|
- $replacement = ( is_array( $options ) && isset( $options[ $replace ] ) ) ? $options[ $replace ] : get_site_option( $replace ); |
|
|
154
|
+ $replacement = ( is_array( $options ) && isset( $options[$replace] ) ) ? $options[$replace] : get_site_option( $replace ); |
|
155
|
155
|
break; |
|
156
|
156
|
case 'user_meta': |
|
157
|
157
|
$user_id = get_current_user_id(); |
|
@@ -166,8 +166,8 @@ discard block |
|
|
block discarded – undo |
|
166
|
166
|
$replacement = ( false === $replacement ) ? '' : $replacement; |
|
167
|
167
|
if ( is_array( $value ) ) { |
|
168
|
168
|
foreach ( $value as $k => $v ) { |
|
169
|
|
- $_val = ( isset( $value[ $v ] ) ) ? $value[ $v ] : $v; |
|
170
|
|
- $value[ $k ] = str_replace( $search, $replacement, $_val ); |
|
|
169
|
+ $_val = ( isset( $value[$v] ) ) ? $value[$v] : $v; |
|
|
170
|
+ $value[$k] = str_replace( $search, $replacement, $_val ); |
|
171
|
171
|
} |
|
172
|
172
|
return $value; |
|
173
|
173
|
} |
|
@@ -209,7 +209,7 @@ discard block |
|
|
block discarded – undo |
|
209
|
209
|
} |
|
210
|
210
|
// If 'choice' is defined check for sub-values too. |
|
211
|
211
|
// Fixes https://github.com/aristath/kirki/issues/1416. |
|
212
|
|
- if ( isset( $output['choice'] ) && isset( $value[ $output['choice'] ] ) && $exclude == $value[ $output['choice'] ] ) { |
|
|
212
|
+ if ( isset( $output['choice'] ) && isset( $value[$output['choice']] ) && $exclude == $value[$output['choice']] ) { |
|
213
|
213
|
$skip = true; |
|
214
|
214
|
} |
|
215
|
215
|
} |
|
@@ -267,13 +267,13 @@ discard block |
|
|
block discarded – undo |
|
267
|
267
|
'background', |
|
268
|
268
|
); |
|
269
|
269
|
if ( in_array( $output['property'], $accepts_multiple, true ) ) { |
|
270
|
|
- if ( isset( $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] ) && ! is_array( $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] ) ) { |
|
271
|
|
- $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = (array) $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ]; |
|
|
270
|
+ if ( isset( $this->styles[$output['media_query']][$output['element']][$output['property']] ) && ! is_array( $this->styles[$output['media_query']][$output['element']][$output['property']] ) ) { |
|
|
271
|
+ $this->styles[$output['media_query']][$output['element']][$output['property']] = (array) $this->styles[$output['media_query']][$output['element']][$output['property']]; |
|
272
|
272
|
} |
|
273
|
|
- $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ][] = $output['prefix'] . $value . $output['units'] . $output['suffix']; |
|
|
273
|
+ $this->styles[$output['media_query']][$output['element']][$output['property']][] = $output['prefix'] . $value . $output['units'] . $output['suffix']; |
|
274
|
274
|
return; |
|
275
|
275
|
} |
|
276
|
|
- $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = $output['prefix'] . $this->process_property_value( $output['property'], $value ) . $output['units'] . $output['suffix']; |
|
|
276
|
+ $this->styles[$output['media_query']][$output['element']][$output['property']] = $output['prefix'] . $this->process_property_value( $output['property'], $value ) . $output['units'] . $output['suffix']; |
|
277
|
277
|
} |
|
278
|
278
|
|
|
279
|
279
|
/** |
|
@@ -295,7 +295,7 @@ discard block |
|
|
block discarded – undo |
|
295
|
295
|
) |
|
296
|
296
|
); |
|
297
|
297
|
if ( array_key_exists( $property, $properties ) ) { |
|
298
|
|
- $classname = $properties[ $property ]; |
|
|
298
|
+ $classname = $properties[$property]; |
|
299
|
299
|
$obj = new $classname( $property, $value ); |
|
300
|
300
|
return $obj->get_value(); |
|
301
|
301
|
} |