Ticket #22499: 22499.diff

Index: wp-content/themes/twentytwelve/functions.php
===================================================================
--- wp-content/themes/twentytwelve/functions.php        (revision 23403)
+++ wp-content/themes/twentytwelve/functions.php        (working copy)
@@ -102,19 +102,39 @@
         */
        wp_enqueue_script( 'twentytwelve-navigation', get_template_directory_uri() . '/js/navigation.js', array(), '1.0', true );
 
+       $font_url = twentytwelve_get_font_url();
+       if ( ! empty( $font_url ) )
+               wp_enqueue_style( 'twentytwelve-fonts', esc_url_raw( $font_url ), array(), null );
+
        /*
-        * Loads our special font CSS file.
-        *
-        * The use of Open Sans by default is localized. For languages that use
-        * characters not supported by the font, the font can be disabled.
-        *
-        * To disable in a child theme, use wp_dequeue_style()
-        * function mytheme_dequeue_fonts() {
-        *     wp_dequeue_style( 'twentytwelve-fonts' );
-        * }
-        * add_action( 'wp_enqueue_scripts', 'mytheme_dequeue_fonts', 11 );
+        * Loads our main stylesheet.
         */
+       wp_enqueue_style( 'twentytwelve-style', get_stylesheet_uri() );
 
+       /*
+        * Loads the Internet Explorer specific stylesheet.
+        */
+       wp_enqueue_style( 'twentytwelve-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentytwelve-style' ), '20121010' );
+       $wp_styles->add_data( 'twentytwelve-ie', 'conditional', 'lt IE 9' );
+}
+add_action( 'wp_enqueue_scripts', 'twentytwelve_scripts_styles' );
+
+/**
+ * Returns the Google font stylesheet URL if available
+ *
+ * The use of Open Sans by default is localized. For languages that use
+ * characters not supported by the font, the font can be disabled.
+ *
+ * To disable in a child theme or plugin, use:
+ * add_filter( 'twentytwelve_get_font_url', '__return_null' );
+ *
+ * @since Twenty Twelve 1.2
+ *
+ * @return string Font stylesheet or empty string if disabled
+ */
+function twentytwelve_get_font_url() {
+       $font_url = '';
+
        /* translators: If there are characters in your language that are not supported
           by Open Sans, translate this to 'off'. Do not translate into your own language. */
        if ( 'off' !== _x( 'on', 'Open Sans font: on or off', 'twentytwelve' ) ) {
@@ -136,21 +156,11 @@
                        'family' => 'Open+Sans:400italic,700italic,400,700',
                        'subset' => $subsets,
                );
-               wp_enqueue_style( 'twentytwelve-fonts', add_query_arg( $query_args, "$protocol://fonts.googleapis.com/css" ), array(), null );
+               $font_url = add_query_arg( $query_args, "$protocol://fonts.googleapis.com/css" );
        }
 
-       /*
-        * Loads our main stylesheet.
-        */
-       wp_enqueue_style( 'twentytwelve-style', get_stylesheet_uri() );
-
-       /*
-        * Loads the Internet Explorer specific stylesheet.
-        */
-       wp_enqueue_style( 'twentytwelve-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentytwelve-style' ), '20121010' );
-       $wp_styles->add_data( 'twentytwelve-ie', 'conditional', 'lt IE 9' );
+       return apply_filters( 'twentytwelve_get_font_url', $font_url );
 }
-add_action( 'wp_enqueue_scripts', 'twentytwelve_scripts_styles' );
 
 /**
  * Creates a nicely formatted and more specific title element text
@@ -448,3 +458,23 @@
        wp_enqueue_script( 'twentytwelve-customizer', get_template_directory_uri() . '/js/theme-customizer.js', array( 'customize-preview' ), '20120827', true );
 }
 add_action( 'customize_preview_init', 'twentytwelve_customize_preview_js' );
+
+/**
+ * Adds additional stylesheets to the TinyMCE editor if needed.
+ *
+ * @uses twentytwelve_get_font_url() To get the Google Font stylesheet URL
+ *
+ * @since Twenty Twelve 1.2
+ */
+function twentytwelve_mce_css( $mce_css ) {
+       $font_url = twentytwelve_get_font_url();
+       if ( empty( $font_url ) )
+               return $mce_css;
+
+       if ( ! empty( $mce_css ) )
+               $mce_css .= ',';
+
+       $mce_css .= esc_url_raw( str_replace( ',', '%2C', $font_url ) );
+       return $mce_css;
+}
+add_filter( 'mce_css', 'twentytwelve_mce_css' );
\ No newline at end of file