Fix Google Fonts breaking in certain cases

HardeepAsrani · HardeepAsrani · commit 114b8a64d9cd · 2022-07-04T15:54:37.000+05:30
diff --git a/inc/css/class-block-frontend.php b/inc/css/class-block-frontend.php
@@ -170,6 +170,9 @@ public function get_fonts( $fonts_list = array() ) {
 						$font['fontvariant'][ $key ] = 400;
 					}
 				}
+
+				sort( $font['fontvariant'] );
+
 				$item .= ':wght@' . implode( ';', $font['fontvariant'] );
 			}
 			array_push( $fonts, $item );
diff --git a/plugins/otter-pro/inc/plugins/class-fonts-module.php b/plugins/otter-pro/inc/plugins/class-fonts-module.php
@@ -26,7 +26,7 @@ class Fonts_Module {
 	 */
 	public function init() {
 		if ( License::has_active_license() ) {
-			if ( true === boolval( get_option( 'otter_offload_fonts', true ) ) ) {
+			if ( true === boolval( get_option( 'otter_offload_fonts', false ) ) ) {
 				add_filter( 'otter_blocks_google_fonts_url', array( $this, 'register_webfont_loader' ) );
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -170,6 +170,9 @@ public function get_fonts( $fonts_list = array() ) {`
`170`	`170`	`$font['fontvariant'][ $key ] = 400;`
`171`	`171`	`}`
`172`	`172`	`}`
	`173`	`+`
	`174`	`+ sort( $font['fontvariant'] );`
	`175`	`+`
`173`	`176`	`$item .= ':wght@' . implode( ';', $font['fontvariant'] );`
`174`	`177`	`}`
`175`	`178`	`array_push( $fonts, $item );`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class Fonts_Module {`
`26`	`26`	`*/`
`27`	`27`	`public function init() {`
`28`	`28`	`if ( License::has_active_license() ) {`
`29`		`- if ( true === boolval( get_option( 'otter_offload_fonts', true ) ) ) {`
	`29`	`+ if ( true === boolval( get_option( 'otter_offload_fonts', false ) ) ) {`
`30`	`30`	`add_filter( 'otter_blocks_google_fonts_url', array( $this, 'register_webfont_loader' ) );`
`31`	`31`	`}`
`32`	`32`