Ticket #6544: 6544.2.diff

File 6544.2.diff, 1.0 KB (added by azaozz, 4 years ago)

Includes the above patch plus one more place that needed fixing.

  • tiny_mce_config.php

     
    4949$https = ( isset($_SERVER['HTTPS']) && 'on' == strtolower($_SERVER['HTTPS']) ) ? true : false; 
    5050         
    5151$baseurl = get_option('siteurl') . '/wp-includes/js/tinymce'; 
    52 if ( $https ) str_replace('http://', 'https://', $baseurl); 
     52if ( $https ) $baseurl = str_replace('http://', 'https://', $baseurl); 
    5353 
    5454$mce_css = $baseurl . '/wordpress.css'; 
    5555$mce_css = apply_filters('mce_css', $mce_css); 
    56 if ( $https ) str_replace('http://', 'https://', $mce_css); 
     56if ( $https ) $mce_css = str_replace('http://', 'https://', $mce_css); 
    5757 
    5858$mce_locale = ( '' == get_locale() ) ? 'en' : strtolower( substr(get_locale(), 0, 2) ); // only ISO 639-1 
    5959 
     
    104104 
    105105        foreach ( $mce_external_plugins as $name => $url ) { 
    106106                 
    107                 if ( $https ) str_replace('http://', 'https://', $url); 
     107                if ( $https ) $url = str_replace('http://', 'https://', $url); 
    108108                 
    109109                $plugins[] = '-' . $name; 
    110110