aristath / kirki

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

Spacing +24 added lines, -24 removed lines

@@ -77,7 +77,7 @@ 
 		$config = apply_filters( 'kirki_config', array() );
 
 		// If we have set $config['disable_google_fonts'] to true then do not proceed any further.
-		if ( isset( $config['disable_google_fonts'] ) && true === $config['disable_google_fonts'] ) {
+		if ( isset( $config[ 'disable_google_fonts' ] ) && true === $config[ 'disable_google_fonts' ] ) {
 			return;
 		}
 
@@ -115,57 +115,57 @@ 
 		global $wp_customize;
 
 		// Process typography fields.
-		if ( isset( $args['type'] ) && 'kirki-typography' === $args['type'] ) {
+		if ( isset( $args[ 'type' ] ) && 'kirki-typography' === $args[ 'type' ] ) {
 
 			// Get the value.
 			$value = Kirki_Values::get_sanitized_field_value( $args );
 
-			if ( isset( $value['downloadFont'] ) && $value['downloadFont'] ) {
-				$this->hosted_fonts[] = $value['font-family'];
+			if ( isset( $value[ 'downloadFont' ] ) && $value[ 'downloadFont' ] ) {
+				$this->hosted_fonts[ ] = $value[ 'font-family' ];
 			}
 
 			// If we don't have a font-family then we can skip this.
-			if ( ! $wp_customize && ( ! isset( $value['font-family'] ) || in_array( $value['font-family'], $this->hosted_fonts ) ) ) {
+			if ( ! $wp_customize && ( ! isset( $value[ 'font-family' ] ) || in_array( $value[ 'font-family' ], $this->hosted_fonts ) ) ) {
 				return;
 			}
 
 			// If not a google-font, then we can skip this.
-			if ( ! Kirki_Fonts::is_google_font( $value['font-family'] ) ) {
+			if ( ! Kirki_Fonts::is_google_font( $value[ 'font-family' ] ) ) {
 				return;
 			}
 
 			// Set a default value for variants.
-			if ( ! isset( $value['variant'] ) ) {
-				$value['variant'] = 'regular';
+			if ( ! isset( $value[ 'variant' ] ) ) {
+				$value[ 'variant' ] = 'regular';
 			}
 
 			// Add the requested google-font.
-			if ( ! isset( $this->fonts[ $value['font-family'] ] ) ) {
-				$this->fonts[ $value['font-family'] ] = array();
+			if ( ! isset( $this->fonts[ $value[ 'font-family' ] ] ) ) {
+				$this->fonts[ $value[ 'font-family' ] ] = array();
 			}
-			if ( ! in_array( $value['variant'], $this->fonts[ $value['font-family'] ], true ) ) {
-				$this->fonts[ $value['font-family'] ][] = $value['variant'];
+			if ( ! in_array( $value[ 'variant' ], $this->fonts[ $value[ 'font-family' ] ], true ) ) {
+				$this->fonts[ $value[ 'font-family' ] ][ ] = $value[ 'variant' ];
 			}
 			// Are we force-loading all variants?
 			if ( true === self::$force_load_all_variants ) {
 				$all_variants               = Kirki_Fonts::get_all_variants();
-				$args['choices']['variant'] = array_keys( $all_variants );
+				$args[ 'choices' ][ 'variant' ] = array_keys( $all_variants );
 			}
 
-			if ( ! empty( $args['choices']['variant'] ) && is_array( $args['choices']['variant'] ) ) {
-				foreach ( $args['choices']['variant'] as $extra_variant ) {
-					$this->fonts[ $value['font-family'] ][] = $extra_variant;
+			if ( ! empty( $args[ 'choices' ][ 'variant' ] ) && is_array( $args[ 'choices' ][ 'variant' ] ) ) {
+				foreach ( $args[ 'choices' ][ 'variant' ] as $extra_variant ) {
+					$this->fonts[ $value[ 'font-family' ] ][ ] = $extra_variant;
 				}
 			}
 			return;
 		}
 
 		// Process non-typography fields.
-		if ( isset( $args['output'] ) && is_array( $args['output'] ) ) {
-			foreach ( $args['output'] as $output ) {
+		if ( isset( $args[ 'output' ] ) && is_array( $args[ 'output' ] ) ) {
+			foreach ( $args[ 'output' ] as $output ) {
 
 				// If we don't have a typography-related output argument we can skip this.
-				if ( ! isset( $output['property'] ) || ! in_array( $output['property'], array( 'font-family', 'font-weight' ), true ) ) {
+				if ( ! isset( $output[ 'property' ] ) || ! in_array( $output[ 'property' ], array( 'font-family', 'font-weight' ), true ) ) {
 					continue;
 				}
 
@@ -173,14 +173,14 @@ 
 				$value = Kirki_Values::get_sanitized_field_value( $args );
 
 				if ( is_string( $value ) ) {
-					if ( 'font-family' === $output['property'] ) {
+					if ( 'font-family' === $output[ 'property' ] ) {
 						if ( ! array_key_exists( $value, $this->fonts ) ) {
 							$this->fonts[ $value ] = array();
 						}
-					} elseif ( 'font-weight' === $output['property'] ) {
+					} elseif ( 'font-weight' === $output[ 'property' ] ) {
 						foreach ( $this->fonts as $font => $variants ) {
 							if ( ! in_array( $value, $variants, true ) ) {
-								$this->fonts[ $font ][] = $value;
+								$this->fonts[ $font ][ ] = $value;
 							}
 						}
 					}
@@ -212,8 +212,8 @@ 
 
 			// Get all valid font variants for this font.
 			$font_variants = array();
-			if ( isset( $this->google_fonts[ $font ]['variants'] ) ) {
-				$font_variants = $this->google_fonts[ $font ]['variants'];
+			if ( isset( $this->google_fonts[ $font ][ 'variants' ] ) ) {
+				$font_variants = $this->google_fonts[ $font ][ 'variants' ];
 			}
 			foreach ( $variants as $variant ) {