diff options
Diffstat (limited to 'wp-includes/js/tinymce/tiny_mce_config.php')
| -rw-r--r-- | wp-includes/js/tinymce/tiny_mce_config.php | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/wp-includes/js/tinymce/tiny_mce_config.php b/wp-includes/js/tinymce/tiny_mce_config.php index 7b1757d..8a2ff72 100644 --- a/wp-includes/js/tinymce/tiny_mce_config.php +++ b/wp-includes/js/tinymce/tiny_mce_config.php @@ -51,14 +51,10 @@ function putFileContents( $path, $content ) { } // Set up init variables -$https = ( isset($_SERVER['HTTPS']) && 'on' == strtolower($_SERVER['HTTPS']) ) ? true : false; - -$baseurl = get_option('siteurl') . '/wp-includes/js/tinymce'; -if ( $https ) $baseurl = str_replace('http://', 'https://', $baseurl); +$baseurl = includes_url('js/tinymce'); $mce_css = $baseurl . '/wordpress.css'; $mce_css = apply_filters('mce_css', $mce_css); -if ( $https ) $mce_css = str_replace('http://', 'https://', $mce_css); $mce_locale = ( '' == get_locale() ) ? 'en' : strtolower( substr(get_locale(), 0, 2) ); // only ISO 639-1 @@ -109,7 +105,7 @@ if ( ! empty($mce_external_plugins) ) { foreach ( $mce_external_plugins as $name => $url ) { - if ( $https ) $url = str_replace('http://', 'https://', $url); + if ( is_ssl() ) $url = str_replace('http://', 'https://', $url); $plugins[] = '-' . $name; @@ -226,7 +222,7 @@ if ( $compress && isset($_SERVER['HTTP_ACCEPT_ENCODING']) ) { // Setup cache info if ( $disk_cache ) { - $cacheKey = apply_filters('tiny_mce_version', '20080622'); + $cacheKey = apply_filters('tiny_mce_version', '20080626'); foreach ( $initArray as $v ) $cacheKey .= $v; @@ -273,7 +269,7 @@ if ( $mce_deprecated ) $mce_options .= $mce_deprecated; $mce_options = rtrim( trim($mce_options), '\n\r,' ); -$content = 'var tinyMCEPreInit = { settings : { themes : "' . $theme . '", plugins : "' . $initArray['plugins'] . '", languages : "' . $language . '", debug : false }, base : "' . $baseurl . '", suffix : "", query : "ver=3101" };'; +$content = 'var tinyMCEPreInit = { settings : { themes : "' . $theme . '", plugins : "' . $initArray['plugins'] . '", languages : "' . $language . '", debug : false }, base : "' . $baseurl . '", suffix : "", query : "ver=311" };'; // Load patch $content .= getFileContents( 'tiny_mce_ext.js' ); |