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

SSL touchups for tiny_mce_config. fixes #6759 

git-svn-id: http://svn.automattic.com/wordpress/trunk@8193 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-06-25 16:55:16 +00:00
parent b42b7b33a7
commit a16f47dc09
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/js/tinymce/tiny_mce_config.php
View File

@ -51,14 +51,10 @@ function putFileContents( $path, $content ) {
} }
// Set up init variables // Set up init variables
$https = ( isset($_SERVER['HTTPS']) && 'on' == strtolower($_SERVER['HTTPS']) ) ? true : false; $baseurl = includes_url('js/tinymce');
$baseurl = get_option('siteurl') . '/wp-includes/js/tinymce';
if ( $https ) $baseurl = str_replace('http://', 'https://', $baseurl);
$mce_css = $baseurl . '/wordpress.css'; $mce_css = $baseurl . '/wordpress.css';
$mce_css = apply_filters('mce_css', $mce_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 $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 ) { 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; $plugins[] = '-' . $name;