Merge branch 'develop' into telemetry

* develop:
  fix: undefined index PHP notice for background-color
  ran npm audit fix
  156 Line missing textdomain
  update google-font json files
  possible fix for #1925
  #1914 passes required envato check for is_plugin_active
  Fix coding style
  Add ability to use "Default Browser Font-Family" in default value

controls/js/script.js

@@ -3387,7 +3387,7 @@ wp.customize.controlConstructor['kirki-typography'] = wp.customize.kirkiDynamicC
 		} );
 
 		// Set the initial value.
-		if ( value['font-family'] ) {
+		if ( value['font-family'] || '' === value['font-family'] ) {
 			fontSelect.val( value['font-family'].replace( /'/g, '"' ) ).trigger( 'change' );
 		}
 

controls/js/src/typography.js

@@ -167,7 +167,7 @@ wp.customize.controlConstructor['kirki-typography'] = wp.customize.kirkiDynamicC
 		} );
 
 		// Set the initial value.
-		if ( value['font-family'] ) {
+		if ( value['font-family'] || '' === value['font-family'] ) {
 			fontSelect.val( value['font-family'].replace( /'/g, '"' ) ).trigger( 'change' );
 		}
 

core/class-kirki-util.php

@@ -60,7 +60,7 @@ public static function is_plugin() {
 		include_once ABSPATH . 'wp-admin/includes/plugin.php';
 
 		// Extra logic in case the plugin is installed but not activated.
-		if ( $_plugin && ! is_plugin_active( $_plugin ) ) {
+		if ( $_plugin && is_plugin_inactive( $_plugin ) ) {
 			return false;
 		}
 		return $is_plugin;

docs/files/class-kirki-installer-section.php

@@ -153,7 +153,7 @@ protected function dismiss_button() {
 							event.preventDefault();
 
 							<?php if ( $show_confirm ) : ?>
-								if ( ! confirm( '<?php esc_attr_e( 'Are you sure? Dismissing this message will hide the installation recommendation and you will have to manually install and activate the plugin in the future.' ); ?>' ) ) {
+								if ( ! confirm( '<?php esc_attr_e( 'Are you sure? Dismissing this message will hide the installation recommendation and you will have to manually install and activate the plugin in the future.', 'textdomain' ); ?>' ) ) {
 									return;
 								}
 							<?php endif; ?>

modules/css/field/class-kirki-output-field-background.php

@@ -36,7 +36,7 @@ protected function process_output( $output, $value ) {
 		foreach ( array( 'background-image', 'background-color', 'background-repeat', 'background-position', 'background-size', 'background-attachment' ) as $property ) {
 
 			// See https://github.com/aristath/kirki/issues/1808.
-			if ( 'background-color' === $property && ( ! isset( $value['background-image'] ) || empty( $value['background-image'] ) ) ) {
+			if ( 'background-color' === $property && isset( $value['background-color'] ) && ( ! isset( $value['background-image'] ) || empty( $value['background-image'] ) ) ) {
 				$this->styles[ $output['media_query'] ][ $output['element'] ]['background'] = $output['prefix'] . $this->process_property_value( $property, $value[ $property ] ) . $output['suffix'];
 			}
 

modules/webfonts/class-kirki-fonts-google-local.php

@@ -100,7 +100,7 @@ private function __construct( $family ) {
 		$key               = sanitize_key( $this->family );
 		$this->folder_path = $this->get_root_path() . "/$key";
 		$this->folder_url  = $this->get_root_url() . "/$key";
-		$this->files        = $this->get_font_family();
+		$this->files       = $this->get_font_family();
 	}
 
 	/**
@@ -437,6 +437,7 @@ public function get_root_url() {
 				$url = str_replace( $original_domain, $mapped_domain, $url );
 			}
 		}
+		$url = set_url_scheme( $url );
 		return apply_filters( 'kirki_googlefonts_root_url', untrailingslashit( esc_url_raw( $url ) ) . '/webfonts' );
 	}
 

package.json

@@ -21,7 +21,7 @@
     "node": ">= 0.10.0"
   },
   "devDependencies": {
-    "grunt": "*",
+    "grunt": "^1.0.3",
     "grunt-contrib-clean": "*",
     "grunt-contrib-concat": "*",
     "grunt-contrib-sass": "*",