From 5d5f2ed56334816a09215aa84ff49ca7da2b17e3 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Tue, 31 Aug 2010 18:26:18 +0000
Subject: [PATCH] Make smilies links SSL aware. Props tech163. fixes #14360

git-svn-id: http://svn.automattic.com/wordpress/trunk@15554 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/formatting.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index 42425aabee..af6f6babf3 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -1424,13 +1424,11 @@ function translate_smiley($smiley) {
 		return '';
 	}
 
-	$siteurl = get_option( 'siteurl' );
-
 	$smiley = trim(reset($smiley));
 	$img = $wpsmiliestrans[$smiley];
 	$smiley_masked = esc_attr($smiley);
 
-	$srcurl = apply_filters('smilies_src', "$siteurl/wp-includes/images/smilies/$img", $img, $siteurl);
+	$srcurl = apply_filters('smilies_src', includes_url("images/smilies/$img"), $img, site_url());
 
 	return " <img src='$srcurl' alt='$smiley_masked' class='wp-smiley' /> ";
 }