Make WordPress Core

Changeset 8193


Ignore:
Timestamp:
06/25/2008 04:55:16 PM (17 years ago)
Author:
ryan
Message:

SSL touchups for tiny_mce_config. fixes #6759

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/js/tinymce/tiny_mce_config.php

    r8167 r8193  
    5252
    5353// Set up init variables
    54 $https = ( isset($_SERVER['HTTPS']) && 'on' == strtolower($_SERVER['HTTPS']) ) ? true : false;
    55    
    56 $baseurl = get_option('siteurl') . '/wp-includes/js/tinymce';
    57 if ( $https ) $baseurl = str_replace('http://', 'https://', $baseurl);
     54$baseurl = includes_url('js/tinymce');
    5855
    5956$mce_css = $baseurl . '/wordpress.css';
    6057$mce_css = apply_filters('mce_css', $mce_css);
    61 if ( $https ) $mce_css = str_replace('http://', 'https://', $mce_css);
    6258
    6359$mce_locale = ( '' == get_locale() ) ? 'en' : strtolower( substr(get_locale(), 0, 2) ); // only ISO 639-1
     
    110106    foreach ( $mce_external_plugins as $name => $url ) {
    111107       
    112         if ( $https ) $url = str_replace('http://', 'https://', $url);
     108        if ( is_ssl() ) $url = str_replace('http://', 'https://', $url);
    113109       
    114110        $plugins[] = '-' . $name;
Note: See TracChangeset for help on using the changeset viewer.