Ticket #45880: 45880.diff

src/wp-content/themes/twentyseventeen/functions.php

@@ -117 +117 @@
          * This theme styles the visual editor to resemble the theme style,
          * specifically font, colors, and column width.
           */
-        add_editor_style( array( 'assets/css/editor-style.css', twentyseventeen_fonts_url() ) );
+        $editor_style = array( 'assets/css/editor-style.css' );
+        $fonts_url    = twentyseventeen_fonts_url();
+        if ( $fonts_url ) {
+                $editor_style[] = $fonts_url;
+        }
+        add_editor_style( $editor_style );
 
         // Load regular editor styles into the new block-based editor.
         add_theme_support( 'editor-styles' );
@@ -445 +450 @@
  */
 function twentyseventeen_scripts() {
         // Add custom fonts, used in the main stylesheet.
-        wp_enqueue_style( 'twentyseventeen-fonts', twentyseventeen_fonts_url(), array(), null );
+        $fonts_url = twentyseventeen_fonts_url();
+        if ( $fonts_url ) {
+                wp_enqueue_style( 'twentyseventeen-fonts', $fonts_url, array(), null );
+        }
 
         // Theme stylesheet.
         wp_enqueue_style( 'twentyseventeen-style', get_stylesheet_uri(), array(), '20190507' );
@@ -511 +519 @@
         // Block styles.
         wp_enqueue_style( 'twentyseventeen-block-editor-style', get_theme_file_uri( '/assets/css/editor-blocks.css' ), array(), '20190328' );
         // Add custom fonts.
-        wp_enqueue_style( 'twentyseventeen-fonts', twentyseventeen_fonts_url(), array(), null );
+        $fonts_url = twentyseventeen_fonts_url();
+        if ( $fonts_url ) {
+                wp_enqueue_style( 'twentyseventeen-fonts', $fonts_url, array(), null );
+        }
 }
 add_action( 'enqueue_block_editor_assets', 'twentyseventeen_block_editor_styles' );