sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Props webmandesign, azaozz.
Fixes #34882.

git-svn-id: https://develop.svn.wordpress.org/trunk@45621 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz 2019-07-11 18:29:09 +00:00
parent 944595cb9d
commit 620704320e
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/wp-includes/class-wp-editor.php
View File

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

8
src/wp-includes/theme.php
View File

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