@@ -119,12 +119,12 @@ discard block |
||
| 119 | 119 | |
| 120 | 120 | $config = apply_filters( 'kirki_config', array() ); |
| 121 | 121 | $priority = 999; |
| 122 | - if ( isset( $config['styles_priority'] ) ) { |
|
| 123 | - $priority = absint( $config['styles_priority'] ); |
|
| 122 | + if ( isset( $config[ 'styles_priority' ] ) ) { |
|
| 123 | + $priority = absint( $config[ 'styles_priority' ] ); |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | // Allow completely disabling Kirki CSS output. |
| 127 | - if ( ( defined( 'KIRKI_NO_OUTPUT' ) && true === KIRKI_NO_OUTPUT ) || ( isset( $config['disable_output'] ) && true === $config['disable_output'] ) ) { |
|
| 127 | + if ( ( defined( 'KIRKI_NO_OUTPUT' ) && true === KIRKI_NO_OUTPUT ) || ( isset( $config[ 'disable_output' ] ) && true === $config[ 'disable_output' ] ) ) { |
|
| 128 | 128 | return; |
| 129 | 129 | } |
| 130 | 130 | |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | |
| 156 | 156 | // If we are in the customizer, load CSS using inline-styles. |
| 157 | 157 | // If we are in the frontend AND self::$ajax is true, then load dynamic CSS using AJAX. |
| 158 | - if ( ( true === self::$ajax ) || ( isset( $config['inline_css'] ) && false === $config['inline_css'] ) ) { |
|
| 158 | + if ( ( true === self::$ajax ) || ( isset( $config[ 'inline_css' ] ) && false === $config[ 'inline_css' ] ) ) { |
|
| 159 | 159 | add_action( 'wp_enqueue_scripts', array( $this, 'frontend_styles' ), $priority ); |
| 160 | 160 | add_action( 'wp_ajax_kirki_dynamic_css', array( $this, 'ajax_dynamic_css' ) ); |
| 161 | 161 | add_action( 'wp_ajax_nopriv_kirki_dynamic_css', array( $this, 'ajax_dynamic_css' ) ); |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | $configs = Kirki::$config; |
| 187 | 187 | if ( ! $this->processed ) { |
| 188 | 188 | foreach ( $configs as $config_id => $args ) { |
| 189 | - if ( isset( $args['disable_output'] ) && true === $args['disable_output'] ) { |
|
| 189 | + if ( isset( $args[ 'disable_output' ] ) && true === $args[ 'disable_output' ] ) { |
|
| 190 | 190 | continue; |
| 191 | 191 | } |
| 192 | 192 | $styles = self::loop_controls( $config_id ); |
@@ -243,19 +243,19 @@ discard block |
||
| 243 | 243 | foreach ( $fields as $field ) { |
| 244 | 244 | |
| 245 | 245 | // Only process fields that belong to $config_id. |
| 246 | - if ( $config_id !== $field['kirki_config'] ) { |
|
| 246 | + if ( $config_id !== $field[ 'kirki_config' ] ) { |
|
| 247 | 247 | continue; |
| 248 | 248 | } |
| 249 | 249 | |
| 250 | 250 | if ( true === apply_filters( "kirki_{$config_id}_css_skip_hidden", true ) ) { |
| 251 | 251 | // Only continue if field dependencies are met. |
| 252 | - if ( ! empty( $field['required'] ) ) { |
|
| 252 | + if ( ! empty( $field[ 'required' ] ) ) { |
|
| 253 | 253 | $valid = true; |
| 254 | 254 | |
| 255 | - foreach ( $field['required'] as $requirement ) { |
|
| 256 | - if ( isset( $requirement['setting'] ) && isset( $requirement['value'] ) && isset( $requirement['operator'] ) ) { |
|
| 257 | - $controller_value = Kirki_Values::get_value( $config_id, $requirement['setting'] ); |
|
| 258 | - if ( ! Kirki_Helper::compare_values( $controller_value, $requirement['value'], $requirement['operator'] ) ) { |
|
| 255 | + foreach ( $field[ 'required' ] as $requirement ) { |
|
| 256 | + if ( isset( $requirement[ 'setting' ] ) && isset( $requirement[ 'value' ] ) && isset( $requirement[ 'operator' ] ) ) { |
|
| 257 | + $controller_value = Kirki_Values::get_value( $config_id, $requirement[ 'setting' ] ); |
|
| 258 | + if ( ! Kirki_Helper::compare_values( $controller_value, $requirement[ 'value' ], $requirement[ 'operator' ] ) ) { |
|
| 259 | 259 | $valid = false; |
| 260 | 260 | } |
| 261 | 261 | } |
@@ -268,7 +268,7 @@ discard block |
||
| 268 | 268 | } |
| 269 | 269 | |
| 270 | 270 | // Only continue if $field['output'] is set. |
| 271 | - if ( isset( $field['output'] ) && ! empty( $field['output'] ) ) { |
|
| 271 | + if ( isset( $field[ 'output' ] ) && ! empty( $field[ 'output' ] ) ) { |
|
| 272 | 272 | $css = Kirki_Helper::array_replace_recursive( $css, Kirki_Modules_CSS_Generator::css( $field ) ); |
| 273 | 273 | |
| 274 | 274 | // Add the globals. |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | $config_ids = Kirki_Config::get_config_ids(); |
| 54 | 54 | global $kirki_deprecated_filters_iteration; |
| 55 | 55 | foreach ( $config_ids as $config_id ) { |
| 56 | - foreach( array( |
|
| 56 | + foreach ( array( |
|
| 57 | 57 | '/dynamic_css', |
| 58 | 58 | '/output/control-classnames', |
| 59 | 59 | '/css/skip_hidden', |
@@ -64,15 +64,15 @@ discard block |
||
| 64 | 64 | $kirki_deprecated_filters_iteration = array( $config_id, $filter_suffix ); |
| 65 | 65 | add_filter( "kirki_{$config_id}_{$filter_suffix}", function( $args ) { |
| 66 | 66 | global $kirki_deprecated_filters_iteration; |
| 67 | - $kirki_deprecated_filters_iteration[1] = str_replace( '-', '_', $kirki_deprecated_filters_iteration[1] ); |
|
| 68 | - return apply_filters( "kirki/{$kirki_deprecated_filters_iteration[0]}/{$kirki_deprecated_filters_iteration[1]}", $args ); |
|
| 67 | + $kirki_deprecated_filters_iteration[ 1 ] = str_replace( '-', '_', $kirki_deprecated_filters_iteration[ 1 ] ); |
|
| 68 | + return apply_filters( "kirki/{$kirki_deprecated_filters_iteration[ 0 ]}/{$kirki_deprecated_filters_iteration[ 1 ]}", $args ); |
|
| 69 | 69 | }, 99 ); |
| 70 | - if ( false !== strpos( $kirki_deprecated_filters_iteration[1], '-' ) ) { |
|
| 71 | - $kirki_deprecated_filters_iteration[1] = str_replace( '-', '_', $kirki_deprecated_filters_iteration[1] ); |
|
| 70 | + if ( false !== strpos( $kirki_deprecated_filters_iteration[ 1 ], '-' ) ) { |
|
| 71 | + $kirki_deprecated_filters_iteration[ 1 ] = str_replace( '-', '_', $kirki_deprecated_filters_iteration[ 1 ] ); |
|
| 72 | 72 | add_filter( "kirki_{$config_id}_{$filter_suffix}", function( $args ) { |
| 73 | 73 | global $kirki_deprecated_filters_iteration; |
| 74 | - $kirki_deprecated_filters_iteration[1] = str_replace( '-', '_', $kirki_deprecated_filters_iteration[1] ); |
|
| 75 | - return apply_filters( "kirki/{$kirki_deprecated_filters_iteration[0]}/{$kirki_deprecated_filters_iteration[1]}", $args ); |
|
| 74 | + $kirki_deprecated_filters_iteration[ 1 ] = str_replace( '-', '_', $kirki_deprecated_filters_iteration[ 1 ] ); |
|
| 75 | + return apply_filters( "kirki/{$kirki_deprecated_filters_iteration[ 0 ]}/{$kirki_deprecated_filters_iteration[ 1 ]}", $args ); |
|
| 76 | 76 | }, 99 ); |
| 77 | 77 | } |
| 78 | 78 | } |
@@ -1,55 +1,68 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | // @codingStandardsIgnoreFile |
| 3 | 3 | |
| 4 | -add_filter( 'kirki_config', function( $args ) { |
|
| 4 | +add_filter( 'kirki_config', function( $args ) |
|
| 5 | +{ |
|
| 5 | 6 | return apply_filters( 'kirki/config', $args ); |
| 6 | 7 | }, 99 ); |
| 7 | 8 | |
| 8 | -add_filter( 'kirki_control_types', function( $args ) { |
|
| 9 | +add_filter( 'kirki_control_types', function( $args ) |
|
| 10 | +{ |
|
| 9 | 11 | return apply_filters( 'kirki/control_types', $args ); |
| 10 | 12 | }, 99 ); |
| 11 | 13 | |
| 12 | -add_filter( 'kirki_section_types', function( $args ) { |
|
| 14 | +add_filter( 'kirki_section_types', function( $args ) |
|
| 15 | +{ |
|
| 13 | 16 | return apply_filters( 'kirki/section_types', $args ); |
| 14 | 17 | }, 99 ); |
| 15 | 18 | |
| 16 | -add_filter( 'kirki_section_types_exclude', function( $args ) { |
|
| 19 | +add_filter( 'kirki_section_types_exclude', function( $args ) |
|
| 20 | +{ |
|
| 17 | 21 | return apply_filters( 'kirki/section_types/exclude', $args ); |
| 18 | 22 | }, 99 ); |
| 19 | 23 | |
| 20 | -add_filter( 'kirki_control_types_exclude', function( $args ) { |
|
| 24 | +add_filter( 'kirki_control_types_exclude', function( $args ) |
|
| 25 | +{ |
|
| 21 | 26 | return apply_filters( 'kirki/control_types/exclude', $args ); |
| 22 | 27 | }, 99 ); |
| 23 | 28 | |
| 24 | -add_filter( 'kirki_controls', function( $args ) { |
|
| 29 | +add_filter( 'kirki_controls', function( $args ) |
|
| 30 | +{ |
|
| 25 | 31 | return apply_filters( 'kirki/controls', $args ); |
| 26 | 32 | }, 99 ); |
| 27 | 33 | |
| 28 | -add_filter( 'kirki_fields', function( $args ) { |
|
| 34 | +add_filter( 'kirki_fields', function( $args ) |
|
| 35 | +{ |
|
| 29 | 36 | return apply_filters( 'kirki/fields', $args ); |
| 30 | 37 | }, 99 ); |
| 31 | 38 | |
| 32 | -add_filter( 'kirki_modules', function( $args ) { |
|
| 39 | +add_filter( 'kirki_modules', function( $args ) |
|
| 40 | +{ |
|
| 33 | 41 | return apply_filters( 'kirki/modules', $args ); |
| 34 | 42 | }, 99 ); |
| 35 | 43 | |
| 36 | -add_filter( 'kirki_panel_types', function( $args ) { |
|
| 44 | +add_filter( 'kirki_panel_types', function( $args ) |
|
| 45 | +{ |
|
| 37 | 46 | return apply_filters( 'kirki/panel_types', $args ); |
| 38 | 47 | }, 99 ); |
| 39 | 48 | |
| 40 | -add_filter( 'kirki_setting_types', function( $args ) { |
|
| 49 | +add_filter( 'kirki_setting_types', function( $args ) |
|
| 50 | +{ |
|
| 41 | 51 | return apply_filters( 'kirki/setting_types', $args ); |
| 42 | 52 | }, 99 ); |
| 43 | 53 | |
| 44 | -add_filter( 'kirki_variable', function( $args ) { |
|
| 54 | +add_filter( 'kirki_variable', function( $args ) |
|
| 55 | +{ |
|
| 45 | 56 | return apply_filters( 'kirki/variable', $args ); |
| 46 | 57 | }, 99 ); |
| 47 | 58 | |
| 48 | -add_filter( 'kirki_values_get_value', function( $arg1, $arg2 ) { |
|
| 59 | +add_filter( 'kirki_values_get_value', function( $arg1, $arg2 ) |
|
| 60 | +{ |
|
| 49 | 61 | return apply_filters( 'kirki/values/get_value', $arg1, $arg2 ); |
| 50 | 62 | }, 99, 2 ); |
| 51 | 63 | |
| 52 | -add_action( 'init', function() { |
|
| 64 | +add_action( 'init', function() |
|
| 65 | +{ |
|
| 53 | 66 | $config_ids = Kirki_Config::get_config_ids(); |
| 54 | 67 | global $kirki_deprecated_filters_iteration; |
| 55 | 68 | foreach ( $config_ids as $config_id ) { |
@@ -62,14 +75,16 @@ discard block |
||
| 62 | 75 | '/webfonts/skip_hidden', |
| 63 | 76 | ) as $filter_suffix ) { |
| 64 | 77 | $kirki_deprecated_filters_iteration = array( $config_id, $filter_suffix ); |
| 65 | - add_filter( "kirki_{$config_id}_{$filter_suffix}", function( $args ) { |
|
| 78 | + add_filter( "kirki_{$config_id}_{$filter_suffix}", function( $args ) |
|
| 79 | + { |
|
| 66 | 80 | global $kirki_deprecated_filters_iteration; |
| 67 | 81 | $kirki_deprecated_filters_iteration[1] = str_replace( '-', '_', $kirki_deprecated_filters_iteration[1] ); |
| 68 | 82 | return apply_filters( "kirki/{$kirki_deprecated_filters_iteration[0]}/{$kirki_deprecated_filters_iteration[1]}", $args ); |
| 69 | 83 | }, 99 ); |
| 70 | 84 | if ( false !== strpos( $kirki_deprecated_filters_iteration[1], '-' ) ) { |
| 71 | 85 | $kirki_deprecated_filters_iteration[1] = str_replace( '-', '_', $kirki_deprecated_filters_iteration[1] ); |
| 72 | - add_filter( "kirki_{$config_id}_{$filter_suffix}", function( $args ) { |
|
| 86 | + add_filter( "kirki_{$config_id}_{$filter_suffix}", function( $args ) |
|
| 87 | + { |
|
| 73 | 88 | global $kirki_deprecated_filters_iteration; |
| 74 | 89 | $kirki_deprecated_filters_iteration[1] = str_replace( '-', '_', $kirki_deprecated_filters_iteration[1] ); |
| 75 | 90 | return apply_filters( "kirki/{$kirki_deprecated_filters_iteration[0]}/{$kirki_deprecated_filters_iteration[1]}", $args ); |
@@ -79,38 +94,47 @@ discard block |
||
| 79 | 94 | } |
| 80 | 95 | }, 99 ); |
| 81 | 96 | |
| 82 | -add_filter( 'kirki_enqueue_google_fonts', function( $args ) { |
|
| 97 | +add_filter( 'kirki_enqueue_google_fonts', function( $args ) |
|
| 98 | +{ |
|
| 83 | 99 | return apply_filters( 'kirki/enqueue_google_fonts', $args ); |
| 84 | 100 | }, 99 ); |
| 85 | 101 | |
| 86 | -add_filter( 'kirki_styles_array', function( $args ) { |
|
| 102 | +add_filter( 'kirki_styles_array', function( $args ) |
|
| 103 | +{ |
|
| 87 | 104 | return apply_filters( 'kirki/styles_array', $args ); |
| 88 | 105 | }, 99 ); |
| 89 | 106 | |
| 90 | -add_filter( 'kirki_dynamic_css_method', function( $args ) { |
|
| 107 | +add_filter( 'kirki_dynamic_css_method', function( $args ) |
|
| 108 | +{ |
|
| 91 | 109 | return apply_filters( 'kirki/dynamic_css/method', $args ); |
| 92 | 110 | }, 99 ); |
| 93 | 111 | |
| 94 | -add_filter( 'kirki_postmessage_script', function( $args ) { |
|
| 112 | +add_filter( 'kirki_postmessage_script', function( $args ) |
|
| 113 | +{ |
|
| 95 | 114 | return apply_filters( 'kirki/postmessage/script', $args ); |
| 96 | 115 | }, 99 ); |
| 97 | 116 | |
| 98 | -add_filter( 'kirki_fonts_all', function( $args ) { |
|
| 117 | +add_filter( 'kirki_fonts_all', function( $args ) |
|
| 118 | +{ |
|
| 99 | 119 | return apply_filters( 'kirki/fonts/all', $args ); |
| 100 | 120 | }, 99 ); |
| 101 | 121 | |
| 102 | -add_filter( 'kirki_fonts_standard_fonts', function( $args ) { |
|
| 122 | +add_filter( 'kirki_fonts_standard_fonts', function( $args ) |
|
| 123 | +{ |
|
| 103 | 124 | return apply_filters( 'kirki/fonts/standard_fonts', $args ); |
| 104 | 125 | }, 99 ); |
| 105 | 126 | |
| 106 | -add_filter( 'kirki_fonts_backup_fonts', function( $args ) { |
|
| 127 | +add_filter( 'kirki_fonts_backup_fonts', function( $args ) |
|
| 128 | +{ |
|
| 107 | 129 | return apply_filters( 'kirki/fonts/backup_fonts', $args ); |
| 108 | 130 | }, 99 ); |
| 109 | 131 | |
| 110 | -add_filter( 'kirki_fonts_google_fonts', function( $args ) { |
|
| 132 | +add_filter( 'kirki_fonts_google_fonts', function( $args ) |
|
| 133 | +{ |
|
| 111 | 134 | return apply_filters( 'kirki/fonts/google_fonts', $args ); |
| 112 | 135 | }, 99 ); |
| 113 | 136 | |
| 114 | -add_filter( 'kirki_googlefonts_load_method', function( $args ) { |
|
| 137 | +add_filter( 'kirki_googlefonts_load_method', function( $args ) |
|
| 138 | +{ |
|
| 115 | 139 | return apply_filters( 'kirki/googlefonts_load_method', $args ); |
| 116 | 140 | }, 99 ); |
@@ -59,10 +59,10 @@ discard block |
||
| 59 | 59 | * @access protected |
| 60 | 60 | */ |
| 61 | 61 | protected function set_choices() { |
| 62 | - if ( ! isset( $this->choices['language'] ) ) { |
|
| 62 | + if ( ! isset( $this->choices[ 'language' ] ) ) { |
|
| 63 | 63 | return; |
| 64 | 64 | } |
| 65 | - $language = $this->choices['language']; |
|
| 65 | + $language = $this->choices[ 'language' ]; |
|
| 66 | 66 | switch ( $language ) { |
| 67 | 67 | case 'json': |
| 68 | 68 | case 'xml': |
@@ -90,11 +90,11 @@ discard block |
||
| 90 | 90 | $language = 'text/x-' . $language; |
| 91 | 91 | break; |
| 92 | 92 | } |
| 93 | - if ( ! isset( $this->editor_settings['codemirror'] ) ) { |
|
| 94 | - $this->editor_settings['codemirror'] = array(); |
|
| 93 | + if ( ! isset( $this->editor_settings[ 'codemirror' ] ) ) { |
|
| 94 | + $this->editor_settings[ 'codemirror' ] = array(); |
|
| 95 | 95 | } |
| 96 | - if ( ! isset( $this->editor_settings['codemirror']['mode'] ) ) { |
|
| 97 | - $this->editor_settings['codemirror']['mode'] = $language; |
|
| 96 | + if ( ! isset( $this->editor_settings[ 'codemirror' ][ 'mode' ] ) ) { |
|
| 97 | + $this->editor_settings[ 'codemirror' ][ 'mode' ] = $language; |
|
| 98 | 98 | } |
| 99 | 99 | } |
| 100 | 100 | |
@@ -32,6 +32,6 @@ |
||
| 32 | 32 | */ |
| 33 | 33 | public function to_json() { |
| 34 | 34 | parent::to_json(); |
| 35 | - $this->json['required'] = $this->required; |
|
| 35 | + $this->json[ 'required' ] = $this->required; |
|
| 36 | 36 | } |
| 37 | 37 | } |
@@ -32,6 +32,6 @@ |
||
| 32 | 32 | */ |
| 33 | 33 | public function to_json() { |
| 34 | 34 | parent::to_json(); |
| 35 | - $this->json['required'] = $this->required; |
|
| 35 | + $this->json[ 'required' ] = $this->required; |
|
| 36 | 36 | } |
| 37 | 37 | } |
@@ -35,23 +35,23 @@ discard block |
||
| 35 | 35 | public function to_json() { |
| 36 | 36 | parent::to_json(); |
| 37 | 37 | |
| 38 | - if ( is_array( $this->json['value'] ) ) { |
|
| 39 | - foreach ( array_keys( $this->json['value'] ) as $key ) { |
|
| 40 | - if ( ! in_array( $key, array( 'variant', 'font-weight', 'font-style' ), true ) && ! isset( $this->json['default'][ $key ] ) ) { |
|
| 41 | - unset( $this->json['value'][ $key ] ); |
|
| 38 | + if ( is_array( $this->json[ 'value' ] ) ) { |
|
| 39 | + foreach ( array_keys( $this->json[ 'value' ] ) as $key ) { |
|
| 40 | + if ( ! in_array( $key, array( 'variant', 'font-weight', 'font-style' ), true ) && ! isset( $this->json[ 'default' ][ $key ] ) ) { |
|
| 41 | + unset( $this->json[ 'value' ][ $key ] ); |
|
| 42 | 42 | } |
| 43 | 43 | // Fix for https://wordpress.org/support/topic/white-font-after-updateing-to-3-0-16. |
| 44 | - if ( ! isset( $this->json['default'][ $key ] ) ) { |
|
| 45 | - unset( $this->json['value'][ $key ] ); |
|
| 44 | + if ( ! isset( $this->json[ 'default' ][ $key ] ) ) { |
|
| 45 | + unset( $this->json[ 'value' ][ $key ] ); |
|
| 46 | 46 | } |
| 47 | 47 | // Fix for https://github.com/aristath/kirki/issues/1405. |
| 48 | - if ( isset( $this->json['default'][ $key ] ) && false === $this->json['default'][ $key ] ) { |
|
| 49 | - unset( $this->json['value'][ $key ] ); |
|
| 48 | + if ( isset( $this->json[ 'default' ][ $key ] ) && false === $this->json[ 'default' ][ $key ] ) { |
|
| 49 | + unset( $this->json[ 'value' ][ $key ] ); |
|
| 50 | 50 | } |
| 51 | 51 | } |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | - $this->json['show_variants'] = ( true === Kirki_Fonts_Google::$force_load_all_variants ) ? false : true; |
|
| 54 | + $this->json[ 'show_variants' ] = ( true === Kirki_Fonts_Google::$force_load_all_variants ) ? false : true; |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | /** |
@@ -238,12 +238,12 @@ discard block |
||
| 238 | 238 | $final_variants = array(); |
| 239 | 239 | foreach ( $variants as $variant ) { |
| 240 | 240 | if ( is_string( $variant ) ) { |
| 241 | - $final_variants[] = array( |
|
| 241 | + $final_variants[ ] = array( |
|
| 242 | 242 | 'id' => $variant, |
| 243 | 243 | 'label' => isset( $all_variants[ $variant ] ) ? $all_variants[ $variant ] : $variant, |
| 244 | 244 | ); |
| 245 | - } elseif ( is_array( $variant ) && isset( $variant['id'] ) && isset( $variant['label'] ) ) { |
|
| 246 | - $final_variants[] = $variant; |
|
| 245 | + } elseif ( is_array( $variant ) && isset( $variant[ 'id' ] ) && isset( $variant[ 'label' ] ) ) { |
|
| 246 | + $final_variants[ ] = $variant; |
|
| 247 | 247 | } |
| 248 | 248 | } |
| 249 | 249 | return $final_variants; |
@@ -137,11 +137,11 @@ |
||
| 137 | 137 | |
| 138 | 138 | $google_fonts = array(); |
| 139 | 139 | if ( is_array( $fonts ) ) { |
| 140 | - foreach ( $fonts['items'] as $font ) { |
|
| 141 | - $google_fonts[ $font['family'] ] = array( |
|
| 142 | - 'label' => $font['family'], |
|
| 143 | - 'variants' => $font['variants'], |
|
| 144 | - 'category' => $font['category'], |
|
| 140 | + foreach ( $fonts[ 'items' ] as $font ) { |
|
| 141 | + $google_fonts[ $font[ 'family' ] ] = array( |
|
| 142 | + 'label' => $font[ 'family' ], |
|
| 143 | + 'variants' => $font[ 'variants' ], |
|
| 144 | + 'category' => $font[ 'category' ], |
|
| 145 | 145 | ); |
| 146 | 146 | } |
| 147 | 147 | } |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | $fonts_to_load = $this->googlefonts->fonts; |
| 88 | 88 | |
| 89 | 89 | if ( ! empty( $fonts_to_load ) && 'preconnect' === $relation_type ) { |
| 90 | - $urls[] = array( |
|
| 90 | + $urls[ ] = array( |
|
| 91 | 91 | 'href' => 'https://fonts.gstatic.com', |
| 92 | 92 | 'crossorigin', |
| 93 | 93 | ); |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | $weights[ $key ] = str_replace( array( 'regular', 'bold', 'italic' ), array( '400', '', 'i' ), $value ); |
| 121 | 121 | } |
| 122 | 122 | } |
| 123 | - $this->fonts_to_load[] = $font . ':' . join( ',', $weights ) . ':cyrillic,cyrillic-ext,devanagari,greek,greek-ext,khmer,latin,latin-ext,vietnamese,hebrew,arabic,bengali,gujarati,tamil,telugu,thai'; |
|
| 123 | + $this->fonts_to_load[ ] = $font . ':' . join( ',', $weights ) . ':cyrillic,cyrillic-ext,devanagari,greek,greek-ext,khmer,latin,latin-ext,vietnamese,hebrew,arabic,bengali,gujarati,tamil,telugu,thai'; |
|
| 124 | 124 | } |
| 125 | 125 | if ( ! empty( $this->fonts_to_load ) ) { |
| 126 | 126 | Kirki_Modules_Webfont_Loader::$load = true; |
@@ -39,18 +39,18 @@ |
||
| 39 | 39 | |
| 40 | 40 | foreach ( array_keys( $value ) as $key ) { |
| 41 | 41 | |
| 42 | - $property = ( empty( $output['property'] ) ) ? $key : $output['property'] . '-' . $key; |
|
| 43 | - if ( isset( $output['choice'] ) && $output['property'] ) { |
|
| 44 | - if ( $key === $output['choice'] ) { |
|
| 45 | - $property = $output['property']; |
|
| 42 | + $property = ( empty( $output[ 'property' ] ) ) ? $key : $output[ 'property' ] . '-' . $key; |
|
| 43 | + if ( isset( $output[ 'choice' ] ) && $output[ 'property' ] ) { |
|
| 44 | + if ( $key === $output[ 'choice' ] ) { |
|
| 45 | + $property = $output[ 'property' ]; |
|
| 46 | 46 | } else { |
| 47 | 47 | continue; |
| 48 | 48 | } |
| 49 | 49 | } |
| 50 | - if ( false !== strpos( $output['property'], '%%' ) ) { |
|
| 51 | - $property = str_replace( '%%', $key, $output['property'] ); |
|
| 50 | + if ( false !== strpos( $output[ 'property' ], '%%' ) ) { |
|
| 51 | + $property = str_replace( '%%', $key, $output[ 'property' ] ); |
|
| 52 | 52 | } |
| 53 | - $this->styles[ $output['media_query'] ][ $output['element'] ][ $property ] = $output['prefix'] . $this->process_property_value( $property, $value[ $key ] ) . $output['suffix']; |
|
| 53 | + $this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ $property ] = $output[ 'prefix' ] . $this->process_property_value( $property, $value[ $key ] ) . $output[ 'suffix' ]; |
|
| 54 | 54 | } |
| 55 | 55 | } |
| 56 | 56 | } |