|
@@ -141,10 +141,10 @@ discard block |
|
|
block discarded – undo |
|
141
|
141
|
$js_var['index_key'] = $key; |
|
142
|
142
|
$callback = $this->get_callback( $args ); |
|
143
|
143
|
if ( is_callable( $callback ) ) { |
|
144
|
|
- $field['scripts'][ $key ] = call_user_func_array( $callback, array( $js_var, $args ) ); |
|
|
144
|
+ $field['scripts'][$key] = call_user_func_array( $callback, array( $js_var, $args ) ); |
|
145
|
145
|
continue; |
|
146
|
146
|
} |
|
147
|
|
- $field['scripts'][ $key ] = $this->script_var( $js_var ); |
|
|
147
|
+ $field['scripts'][$key] = $this->script_var( $js_var ); |
|
148
|
148
|
} |
|
149
|
149
|
$combo_extra_script = ''; |
|
150
|
150
|
$combo_css_script = ''; |
|
@@ -338,7 +338,7 @@ discard block |
|
|
block discarded – undo |
|
338
|
338
|
'font-weight' => 'fontWeight', |
|
339
|
339
|
'font-style' => 'fontStyle', |
|
340
|
340
|
); |
|
341
|
|
- $choice_condition = ( isset( $args['choice'] ) && '' !== $args['choice'] && isset( $css_build_array[ $args['choice'] ] ) ); |
|
|
341
|
+ $choice_condition = ( isset( $args['choice'] ) && '' !== $args['choice'] && isset( $css_build_array[$args['choice']] ) ); |
|
342
|
342
|
$script .= ( ! $choice_condition ) ? $webfont_loader : ''; |
|
343
|
343
|
foreach ( $css_build_array as $property => $var ) { |
|
344
|
344
|
if ( $choice_condition && $property !== $args['choice'] ) { |
Please login to merge, or discard this patch.