Changeset 45621

Timestamp:

07/11/2019 06:29:09 PM (6 years ago)

Author:

azaozz

Message:

Editor: Make registered editor stylesheets (editor-style.css) available to the front-end.

Props webmandesign, azaozz.
Fixes #34882.

Location:

trunk/src/wp-includes

Files:

• class-wp-editor.php (modified) (1 diff)
• theme.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-editor.php

@@ -541 +541 @@
                 }
 
-                $mce_css       = $settings['content_css'];
-                $editor_styles = get_editor_stylesheets();
-
-                if ( ! empty( $editor_styles ) ) {
-                    // Force urlencoding of commas.
-                    foreach ( $editor_styles as $key => $url ) {
-                        if ( strpos( $url, ',' ) !== false ) {
-                            $editor_styles[ $key ] = str_replace( ',', '%2C', $url );
+                $mce_css = $settings['content_css'];
+
+                // The `editor-style.css` added by the theme is generally intended for the editor instance on the Edit Post screen.
+                // Plugins that use wp_editor() on the front-end can decide whether to add the theme stylesheet
+                // by using `get_editor_stylesheets()` and the `mce_css` or `tiny_mce_before_init` filters, see below.
+                if ( is_admin() ) {
+                    $editor_styles = get_editor_stylesheets();
+
+                    if ( ! empty( $editor_styles ) ) {
+                        // Force urlencoding of commas.
+                        foreach ( $editor_styles as $key => $url ) {
+                            if ( strpos( $url, ',' ) !== false ) {
+                                $editor_styles[ $key ] = str_replace( ',', '%2C', $url );
+                            }
                         }
+
+                        $mce_css .= ',' . implode( ',', $editor_styles );
                     }
-
-                    $mce_css .= ',' . implode( ',', $editor_styles );
                 }
 

trunk/src/wp-includes/theme.php

@@ -1925 +1925 @@
  */
 function add_editor_style( $stylesheet = 'editor-style.css' ) {
+    global $editor_styles;
+
     add_theme_support( 'editor-style' );
 
-    if ( ! is_admin() ) {
-        return;
-    }
-
-    global $editor_styles;
     $editor_styles = (array) $editor_styles;
     $stylesheet    = (array) $stylesheet;
+
     if ( is_rtl() ) {
         $rtl_stylesheet = str_replace( '.css', '-rtl.css', $stylesheet[0] );