Changeset 8193

Timestamp:

06/25/2008 04:55:16 PM (17 years ago)

Author:

ryan

Message:

SSL touchups for tiny_mce_config. fixes #6759

File:

• trunk/wp-includes/js/tinymce/tiny_mce_config.php (modified) (2 diffs)

trunk/wp-includes/js/tinymce/tiny_mce_config.php

@@ -52 +52 @@
 
 // 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
@@ -110 +106 @@
     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;