Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add_editor_style() third pass. better performance and better child theme support. see #11512 

git-svn-id: http://svn.automattic.com/wordpress/trunk@13453 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-02-27 07:36:35 +00:00
parent fcb5acb7e5
commit 9797dacaa0
2 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
wp-admin/includes/post.php
View File

@ -1305,7 +1305,7 @@ function post_preview() {
* @param mixed $settings optional An array that can add to or overwrite the default TinyMCE settings.
*/
function wp_tiny_mce( $teeny = false, $settings = false ) {
global $concatenate_scripts, $compress_scripts, $tinymce_version;
global $concatenate_scripts, $compress_scripts, $tinymce_version, $editor_styles;
if ( ! user_can_richedit() )
return;
@ -1467,7 +1467,29 @@ function wp_tiny_mce( $teeny = false, $settings = false ) {
'plugins' => $plugins
);
$mce_css = trim(apply_filters('mce_css', ''), ' ,');
if ( ! empty( $editor_styles ) && is_array( $editor_styles ) ) {
$mce_css = array();
$style_uri = get_stylesheet_directory_uri();
if ( TEMPLATEPATH == STYLESHEETPATH ) {
foreach ( $editor_styles as $file )
$mce_css[] = "$style_uri/$file";
} else {
$style_dir = get_stylesheet_directory();
$template_uri = get_template_directory_uri();
$template_dir = get_template_directory();
foreach ( $editor_styles as $file ) {
if ( file_exists( "$style_dir/$file" ) )
$mce_css[] = "$style_uri/$file";
if ( file_exists( "$template_dir/$file" ) )
$mce_css[] = "$template_uri/$file";
}
}
$mce_css = implode( ',', $mce_css );
} else {
$mce_css = '';
}
$mce_css = trim( apply_filters( 'mce_css', $mce_css ), ' ,' );
if ( ! empty($mce_css) )
$initArray['content_css'] = $mce_css;

34
wp-includes/theme.php
View File

@ -1465,35 +1465,10 @@ function add_editor_style( $stylesheet = 'editor-style.css' ) {
if ( ! is_admin() )
return;
global $editor_style;
$editor_style = (array) $editor_style;
$stylesheet = (array) $stylesheet;
foreach ( $stylesheet as $file ) {
if ( file_exists( get_stylesheet_directory() . "/$file" )
&& ( $uri = get_stylesheet_directory_uri() . "/$file" )
&& ! in_array( $uri, $editor_style ) )
$editor_style[] = $uri;
elseif ( TEMPLATEPATH !== STYLESHEETPATH
&& file_exists( get_template_directory() . "/$file" )
&& ( $uri = get_template_directory_uri() . "/$file" )
&& ! in_array( $uri, $editor_style ) )
$editor_style[] = $uri;
}
add_filter( 'mce_css', '_editor_style_cb' );
}
/**
* Callback for custom editor stylesheet support.
*
* @since 3.0.0
* @see add_editor_style()
* @access protected
*/
function _editor_style_cb( $url ) {
global $editor_style;
if ( ! empty( $url ) )
$url .= ',';
return $url . implode( ',', $editor_style );
global $editor_styles;
$editor_styles = (array) $editor_styles;
$stylesheet = (array) $stylesheet;
$editor_styles = array_merge( $editor_styles, $stylesheet );
}
/**
@ -1520,7 +1495,6 @@ function add_theme_support( $feature ) {
* @param string $feature the feature being checked
* @return boolean
*/
function current_theme_supports( $feature ) {
global $_wp_theme_features;