From 486e80bdf5da7e5954867fe28bf55b9f72b7e861 Mon Sep 17 00:00:00 2001
From: Gary Pendergast <gary@pento.net>
Date: Tue, 31 Mar 2015 04:31:29 +0000
Subject: [PATCH] Emoji: Change the emoji CDN to w.org, from wp.com.

See #31651.


Built from https://develop.svn.wordpress.org/trunk@31938


git-svn-id: http://core.svn.wordpress.org/trunk@31917 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/formatting.php | 4 ++--
 wp-includes/version.php    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index 0f6fc558dd..fbbdfc58ee 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -4125,7 +4125,7 @@ function print_emoji_detection_script() {
 		 *
 		 * @param string The emoji base URL.
 		 */
-		'baseUrl' => apply_filters( 'emoji_url', set_url_scheme( '//s0.wp.com/wp-content/mu-plugins/emoji/twemoji/72x72' ) ),
+		'baseUrl' => apply_filters( 'emoji_url', set_url_scheme( '//s.w.org/images/core/emoji/72x72' ) ),
 
 		/**
 		 * Filter the extension of the emoji files.
@@ -4239,7 +4239,7 @@ function wp_staticize_emoji( $text ) {
 	}
 
 	/** This filter is documented in wp-includes/formatting.php */
-	$cdn_url = apply_filters( 'emoji_url', set_url_scheme( '//s0.wp.com/wp-content/mu-plugins/emoji/twemoji/72x72/' ) );
+	$cdn_url = apply_filters( 'emoji_url', set_url_scheme( '//s.w.org/images/core/emoji/72x72' ) );
 
 	/** This filter is documented in wp-includes/formatting.php */
 	$ext = apply_filters( 'emoji_ext', '.png' );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index c97d07a420..643d351aed 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-beta3-31937';
+$wp_version = '4.2-beta3-31938';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.