Smilies on SSL

[tech163]

When I have smiles in comments, they are not served in SSL, even if I enabled FORCE_SSL_ADMIN in wp-config.

I think this can be fixed by changing:

	$siteurl = get_option( 'siteurl' );

to

	$siteurl = get_option( 'siteurl' );

	if($_SERVER['HTTPS'] == 'on') {
		if(substr($siteurl, 0, 5) == 'http:') {
			$siturl = 'https:' . substr($siteurl, 5);
		}
	}

on line 1427 of /wp-includes/formatting.php.

Can someone else verify that this works?

[nacin]

A simple switch from get_option('site_url') to site_url() will handle that.

And really, the whole thing should instead use includes_url() and then pass that result to the filter.

[ryan]

Use includes_url()

[ryan]

(In [15554]) Make smilies links SSL aware. Props tech163. fixes #14360