SSL touchups for tiny_mce_config. fixes #6759

git-svn-id: https://develop.svn.wordpress.org/trunk@8193 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren 2008-06-25 16:55:16 +00:00
parent f56c238807
commit f7524dfd14
1 changed files with 2 additions and 6 deletions

View File

@ -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;