|
@@ -80,8 +80,8 @@ discard block |
|
|
block discarded – undo |
|
80
|
80
|
return $value; |
|
81
|
81
|
} |
|
82
|
82
|
|
|
83
|
|
- if ( is_array( $value ) && isset( $output['choice'] ) && isset( $this->value[ $output['choice'] ] ) ) { |
|
84
|
|
- $value[ $output['choice'] ] = call_user_func( $output['sanitize_callback'], $this->value[ $output['choice'] ] ); |
|
|
83
|
+ if ( is_array( $value ) && isset( $output['choice'] ) && isset( $this->value[$output['choice']] ) ) { |
|
|
84
|
+ $value[$output['choice']] = call_user_func( $output['sanitize_callback'], $this->value[$output['choice']] ); |
|
85
|
85
|
return $value; |
|
86
|
86
|
} |
|
87
|
87
|
return call_user_func( $output['sanitize_callback'], $this->value ); |
|
@@ -106,16 +106,16 @@ discard block |
|
|
block discarded – undo |
|
106
|
106
|
} |
|
107
|
107
|
if ( is_array( $value ) ) { |
|
108
|
108
|
foreach ( array_keys( $value ) as $value_k ) { |
|
109
|
|
- if ( ! is_string( $value[ $value_k ] ) ) { |
|
|
109
|
+ if ( ! is_string( $value[$value_k] ) ) { |
|
110
|
110
|
continue; |
|
111
|
111
|
} |
|
112
|
112
|
if ( isset( $output['choice'] ) ) { |
|
113
|
113
|
if ( $output['choice'] === $value_k ) { |
|
114
|
|
- $value[ $output['choice'] ] = str_replace( '$', $value[ $output['choice'] ], $output['value_pattern'] ); |
|
|
114
|
+ $value[$output['choice']] = str_replace( '$', $value[$output['choice']], $output['value_pattern'] ); |
|
115
|
115
|
} |
|
116
|
116
|
continue; |
|
117
|
117
|
} |
|
118
|
|
- $value[ $value_k ] = str_replace( '$', $value[ $value_k ], $output['value_pattern'] ); |
|
|
118
|
+ $value[$value_k] = str_replace( '$', $value[$value_k], $output['value_pattern'] ); |
|
119
|
119
|
} |
|
120
|
120
|
} |
|
121
|
121
|
$value = $this->apply_pattern_replace( $output, $value ); |
|
@@ -145,16 +145,16 @@ discard block |
|
|
block discarded – undo |
|
145
|
145
|
if ( is_array( $options ) ) { |
|
146
|
146
|
if ( $option_name ) { |
|
147
|
147
|
$subkey = str_replace( array( $option_name, '[', ']' ), '', $replace ); |
|
148
|
|
- $replacement = ( isset( $options[ $subkey ] ) ) ? $options[ $subkey ] : ''; |
|
|
148
|
+ $replacement = ( isset( $options[$subkey] ) ) ? $options[$subkey] : ''; |
|
149
|
149
|
break; |
|
150
|
150
|
} |
|
151
|
|
- $replacement = ( isset( $options[ $replace ] ) ) ? $options[ $replace ] : ''; |
|
|
151
|
+ $replacement = ( isset( $options[$replace] ) ) ? $options[$replace] : ''; |
|
152
|
152
|
break; |
|
153
|
153
|
} |
|
154
|
154
|
$replacement = get_option( $replace ); |
|
155
|
155
|
break; |
|
156
|
156
|
case 'site_option': |
|
157
|
|
- $replacement = ( is_array( $options ) && isset( $options[ $replace ] ) ) ? $options[ $replace ] : get_site_option( $replace ); |
|
|
157
|
+ $replacement = ( is_array( $options ) && isset( $options[$replace] ) ) ? $options[$replace] : get_site_option( $replace ); |
|
158
|
158
|
break; |
|
159
|
159
|
case 'user_meta': |
|
160
|
160
|
$user_id = get_current_user_id(); |
|
@@ -171,11 +171,11 @@ discard block |
|
|
block discarded – undo |
|
171
|
171
|
foreach ( $value as $k => $v ) { |
|
172
|
172
|
if ( isset( $output['choice'] ) ) { |
|
173
|
173
|
if ( $k === $output['choice'] ) { |
|
174
|
|
- $value[ $k ] = str_replace( $search, $replacement, $v ); |
|
|
174
|
+ $value[$k] = str_replace( $search, $replacement, $v ); |
|
175
|
175
|
} |
|
176
|
176
|
continue; |
|
177
|
177
|
} |
|
178
|
|
- $value[ $k ] = str_replace( $search, $replacement, $v ); |
|
|
178
|
+ $value[$k] = str_replace( $search, $replacement, $v ); |
|
179
|
179
|
} |
|
180
|
180
|
return $value; |
|
181
|
181
|
} |
|
@@ -217,7 +217,7 @@ discard block |
|
|
block discarded – undo |
|
217
|
217
|
} |
|
218
|
218
|
// If 'choice' is defined check for sub-values too. |
|
219
|
219
|
// Fixes https://github.com/aristath/kirki/issues/1416. |
|
220
|
|
- if ( isset( $output['choice'] ) && isset( $value[ $output['choice'] ] ) && $exclude == $value[ $output['choice'] ] ) { |
|
|
220
|
+ if ( isset( $output['choice'] ) && isset( $value[$output['choice']] ) && $exclude == $value[$output['choice']] ) { |
|
221
|
221
|
$skip = true; |
|
222
|
222
|
} |
|
223
|
223
|
} |
|
@@ -275,13 +275,13 @@ discard block |
|
|
block discarded – undo |
|
275
|
275
|
'background', |
|
276
|
276
|
); |
|
277
|
277
|
if ( in_array( $output['property'], $accepts_multiple, true ) ) { |
|
278
|
|
- if ( isset( $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] ) && ! is_array( $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] ) ) { |
|
279
|
|
- $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = (array) $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ]; |
|
|
278
|
+ if ( isset( $this->styles[$output['media_query']][$output['element']][$output['property']] ) && ! is_array( $this->styles[$output['media_query']][$output['element']][$output['property']] ) ) { |
|
|
279
|
+ $this->styles[$output['media_query']][$output['element']][$output['property']] = (array) $this->styles[$output['media_query']][$output['element']][$output['property']]; |
|
280
|
280
|
} |
|
281
|
|
- $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ][] = $output['prefix'] . $value . $output['units'] . $output['suffix']; |
|
|
281
|
+ $this->styles[$output['media_query']][$output['element']][$output['property']][] = $output['prefix'] . $value . $output['units'] . $output['suffix']; |
|
282
|
282
|
return; |
|
283
|
283
|
} |
|
284
|
|
- $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = $output['prefix'] . $this->process_property_value( $output['property'], $value ) . $output['units'] . $output['suffix']; |
|
|
284
|
+ $this->styles[$output['media_query']][$output['element']][$output['property']] = $output['prefix'] . $this->process_property_value( $output['property'], $value ) . $output['units'] . $output['suffix']; |
|
285
|
285
|
} |
|
286
|
286
|
|
|
287
|
287
|
/** |
|
@@ -301,7 +301,7 @@ discard block |
|
|
block discarded – undo |
|
301
|
301
|
'background-position' => 'Kirki_Output_Property_Background_Position', |
|
302
|
302
|
) ); |
|
303
|
303
|
if ( array_key_exists( $property, $properties ) ) { |
|
304
|
|
- $classname = $properties[ $property ]; |
|
|
304
|
+ $classname = $properties[$property]; |
|
305
|
305
|
$obj = new $classname( $property, $value ); |
|
306
|
306
|
return $obj->get_value(); |
|
307
|
307
|
} |