Changeset 8242 for branches/crazyhorse/wp-includes/js/tinymce/tiny_mce_config.php

Timestamp:

07/02/2008 11:07:56 PM (17 years ago)

Author:

mdawaffe

Message:

crazyhorse: merge with log:trunk@8151:8240

File:

• branches/crazyhorse/wp-includes/js/tinymce/tiny_mce_config.php (modified) (4 diffs)

branches/crazyhorse/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;
@@ -227 +223 @@
 if ( $disk_cache ) {
 
-    $cacheKey = apply_filters('tiny_mce_version', '20080618');
+    $cacheKey = apply_filters('tiny_mce_version', '20080626');
 
     foreach ( $initArray as $v )
@@ -274 +270 @@
 $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