vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-07-01 15:50:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@13453 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin
2010-02-27 07:36:35 +00:00
parent 039b7de070
commit bd51cf8b51
2 changed files with 28 additions and 32 deletions
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;