Merge branch 'develop' of https://github.com/siteorigin/origami into …

…phpcs # Conflicts: # functions.php # inc/customizer/customizer.php
siteorigin · Feb 12, 2024 · aed7e3b · aed7e3b
2 parents 8fcbbd5 + 9f808d9
commit aed7e3b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/functions.php b/functions.php
@@ -268,12 +268,14 @@ function origami_save_post( $post_id ) {
 	 * This just displays the Google web fonts
 	 */
 	function origami_enqueue_google_webfonts() {
+		$google_fonts_url = esc_url( apply_filters( 'siteorigin_web_font_url', 'https://fonts.googleapis.com/css' ) );
+
 		if ( ! get_header_image() ) {
 			// Enqueue the logo font as well (Terminal Dosis 200)
-			wp_enqueue_style( 'google-webfonts', '//fonts.googleapis.com/css?family=Terminal+Dosis:200,400' );
+			wp_enqueue_style( 'google-webfonts', $google_fonts_url . '?family=Terminal+Dosis:200,400' );
 		} else {
 			// Enqueue only the text fonts that we need
-			wp_enqueue_style( 'google-webfonts', '//fonts.googleapis.com/css?family=Terminal+Dosis:400' );
+			wp_enqueue_style( 'google-webfonts', $google_fonts_url . '?family=Terminal+Dosis:400' );
 		}
 	}
 }

diff --git a/inc/customizer/customizer.php b/inc/customizer/customizer.php
@@ -5,6 +5,9 @@
 	 * A customizer control for choosing web fonts
 	 */
 	class SiteOrigin_Customize_Fonts_Control extends WP_Customize_Control {
+		public $id;
+		public $type;
+
 		public function __construct( $manager, $id, $args = array() ) {
 			// Let other themes and plugins process the web fonts array
 			$google_web_fonts = include __DIR__ . '/google-fonts.php';
@@ -59,7 +62,7 @@ protected function render() {
 	class SiteOrigin_Customizer_CSS_Builder {
 		private $css;
 		private $raw_css;
-		private $fonts;
+		private $google_fonts;
 		private $defaults;
 
 		// These are web safe fonts