@@ -340,7 +340,8 @@ |
||
| 340 | 340 | $key = md5( $value['font-family'] . $value['variant'] . $value['subset'] ); |
| 341 | 341 | // check that the URL is valid. we're going to use transients to make this faster. |
| 342 | 342 | $url_is_valid = get_transient( $key ); |
| 343 | - if ( false === $url_is_valid ) { // transient does not exist |
|
| 343 | + if ( false === $url_is_valid ) { |
|
| 344 | +// transient does not exist |
|
| 344 | 345 | $response = wp_remote_get( 'https:' . $url ); |
| 345 | 346 | if ( ! is_array( $response ) ) { |
| 346 | 347 | // the url was not properly formatted, |
@@ -69,22 +69,22 @@ discard block |
||
| 69 | 69 | // Kirki does not exist, continue with our custom implementation. |
| 70 | 70 | // Get the default value of the field. |
| 71 | 71 | $default = ''; |
| 72 | - if ( isset( self::$fields[ $field_id ] ) && isset( self::$fields[ $field_id ]['default'] ) ) { |
|
| 73 | - $default = self::$fields[ $field_id ]['default']; |
|
| 72 | + if ( isset( self::$fields[$field_id] ) && isset( self::$fields[$field_id]['default'] ) ) { |
|
| 73 | + $default = self::$fields[$field_id]['default']; |
|
| 74 | 74 | } |
| 75 | 75 | // Make sure the config is defined. |
| 76 | - if ( isset( self::$config[ $config_id ] ) ) { |
|
| 77 | - if ( 'option' == self::$config[ $config_id ]['option_type'] ) { |
|
| 76 | + if ( isset( self::$config[$config_id] ) ) { |
|
| 77 | + if ( 'option' == self::$config[$config_id]['option_type'] ) { |
|
| 78 | 78 | // check if we're using serialized options. |
| 79 | - if ( isset( self::$config[ $config_id ]['option_name'] ) && ! empty( self::$config[ $config_id ]['option_name'] ) ) { |
|
| 79 | + if ( isset( self::$config[$config_id]['option_name'] ) && ! empty( self::$config[$config_id]['option_name'] ) ) { |
|
| 80 | 80 | // Get all our options. |
| 81 | - $all_options = get_option( self::$config[ $config_id ]['option_name'], array() ); |
|
| 81 | + $all_options = get_option( self::$config[$config_id]['option_name'], array() ); |
|
| 82 | 82 | // If our option is not saved, return the default value. |
| 83 | - if ( ! isset( $all_options[ $field_id ] ) ) { |
|
| 83 | + if ( ! isset( $all_options[$field_id] ) ) { |
|
| 84 | 84 | return $default; |
| 85 | 85 | } |
| 86 | 86 | // Option was set, return its value unserialized. |
| 87 | - return maybe_unserialize( $all_options[ $field_id ] ); |
|
| 87 | + return maybe_unserialize( $all_options[$field_id] ); |
|
| 88 | 88 | } |
| 89 | 89 | // If we're not using serialized options, get the value and return it. |
| 90 | 90 | // We'll be using a dummy default here to check if the option has been set or not. |
@@ -142,10 +142,10 @@ discard block |
||
| 142 | 142 | return; |
| 143 | 143 | } |
| 144 | 144 | // Kirki does not exist, set the config arguments |
| 145 | - $config[ $config_id ] = $args; |
|
| 145 | + $config[$config_id] = $args; |
|
| 146 | 146 | // Make sure an option_type is defined |
| 147 | - if ( ! isset( self::$config[ $config_id ]['option_type'] ) ) { |
|
| 148 | - self::$config[ $config_id ]['option_type'] = 'theme_mod'; |
|
| 147 | + if ( ! isset( self::$config[$config_id]['option_type'] ) ) { |
|
| 148 | + self::$config[$config_id]['option_type'] = 'theme_mod'; |
|
| 149 | 149 | } |
| 150 | 150 | } |
| 151 | 151 | |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | if ( ! isset( $args['kirki_config'] ) ) { |
| 170 | 170 | $args['kirki_config'] = $config_id; |
| 171 | 171 | } |
| 172 | - self::$fields[ $args['settings'] ] = $args; |
|
| 172 | + self::$fields[$args['settings']] = $args; |
|
| 173 | 173 | } |
| 174 | 174 | } |
| 175 | 175 | |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | if ( ! is_array( $value ) ) { |
| 238 | 238 | $value = str_replace( '$', $value, $output['value_pattern'] ); |
| 239 | 239 | if ( ! empty( $output['element'] ) && ! empty( $output['property'] ) ) { |
| 240 | - $css[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = $output['prefix'] . $value . $output['units'] . $output['suffix']; |
|
| 240 | + $css[$output['media_query']][$output['element']][$output['property']] = $output['prefix'] . $value . $output['units'] . $output['suffix']; |
|
| 241 | 241 | } |
| 242 | 242 | } else { |
| 243 | 243 | if ( 'typography' == $field['type'] ) { |
@@ -248,25 +248,25 @@ discard block |
||
| 248 | 248 | } |
| 249 | 249 | // add double quotes if needed to font-families |
| 250 | 250 | if ( 'font-family' == $key && false !== strpos( $subvalue, ' ' ) && false === strpos( $subvalue, '"' ) ) { |
| 251 | - $css[ $output['media_query'] ][ $output['element'] ]['font-family'] = '"' . $subvalue . '"'; |
|
| 251 | + $css[$output['media_query']][$output['element']]['font-family'] = '"' . $subvalue . '"'; |
|
| 252 | 252 | } |
| 253 | 253 | // variants contain both font-weight & italics |
| 254 | 254 | if ( 'variant' == $key ) { |
| 255 | 255 | $font_weight = str_replace( 'italic', '', $subvalue ); |
| 256 | 256 | $font_weight = ( in_array( $font_weight, array( '', 'regular' ) ) ) ? '400' : $font_weight; |
| 257 | - $css[ $output['media_query'] ][ $output['element'] ]['font-weight'] = $font_weight; |
|
| 257 | + $css[$output['media_query']][$output['element']]['font-weight'] = $font_weight; |
|
| 258 | 258 | // Is this italic? |
| 259 | 259 | $is_italic = ( false !== strpos( $subvalue, 'italic' ) ); |
| 260 | 260 | if ( $is_italic ) { |
| 261 | - $css[ $output['media_query'] ][ $output['element'] ]['font-style'] = 'italic'; |
|
| 261 | + $css[$output['media_query']][$output['element']]['font-style'] = 'italic'; |
|
| 262 | 262 | } |
| 263 | 263 | } else { |
| 264 | - $css[ $output['media_query'] ][ $output['element'] ][ $key ] = $subvalue; |
|
| 264 | + $css[$output['media_query']][$output['element']][$key] = $subvalue; |
|
| 265 | 265 | } |
| 266 | 266 | } |
| 267 | 267 | } elseif ( 'multicolor' == $field['type'] ) { |
| 268 | 268 | if ( ! empty( $output['element'] ) && ! empty( $output['property'] ) && ! empty( $output['choice'] ) ) { |
| 269 | - $css[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = $output['prefix'] . $value[ $output['choice'] ] . $output['units'] . $output['suffix']; |
|
| 269 | + $css[$output['media_query']][$output['element']][$output['property']] = $output['prefix'] . $value[$output['choice']] . $output['units'] . $output['suffix']; |
|
| 270 | 270 | } |
| 271 | 271 | } else { |
| 272 | 272 | foreach ( $value as $key => $subvalue ) { |
@@ -280,7 +280,7 @@ discard block |
||
| 280 | 280 | $subvalue = 'url("' . $subvalue . '")'; |
| 281 | 281 | } |
| 282 | 282 | if ( $subvalue ) { |
| 283 | - $css[ $output['media_query'] ][ $output['element'] ][ $property ] = $subvalue; |
|
| 283 | + $css[$output['media_query']][$output['element']][$property] = $subvalue; |
|
| 284 | 284 | } |
| 285 | 285 | } |
| 286 | 286 | } |