From f454fc8165ddad2dceb6e1a4ac9c47ad6093f324 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sun, 9 Feb 2020 04:55:06 +0000
Subject: [PATCH] Embeds: Add support for TikTok.

Props audrasjb, jblz, peterwilsoncc, felipeloureirosantos.
Fixes #49083.
Built from https://develop.svn.wordpress.org/trunk@47216


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

diff --git a/wp-includes/class-wp-oembed.php b/wp-includes/class-wp-oembed.php
index f0db84561a..93795c35d6 100644
--- a/wp-includes/class-wp-oembed.php
+++ b/wp-includes/class-wp-oembed.php
@@ -113,6 +113,7 @@ class WP_oEmbed {
 			'#https?://www\.someecards\.com/.+-cards/.+#i' => array( 'https://www.someecards.com/v2/oembed/', true ),
 			'#https?://www\.someecards\.com/usercards/viewcard/.+#i' => array( 'https://www.someecards.com/v2/oembed/', true ),
 			'#https?://some\.ly\/.+#i'                     => array( 'https://www.someecards.com/v2/oembed/', true ),
+			'#https?://(www\.)?tiktok\.com/.*/video/.*#i'  => array( 'https://www.tiktok.com/oembed', true ),
 		);
 
 		if ( ! empty( self::$early_providers['add'] ) ) {
@@ -195,6 +196,7 @@ class WP_oEmbed {
 		 * | Crowdsignal  | survey.fm                                 | 5.1.0   |
 		 * | Instagram TV | instagram.com                             | 5.1.0   |
 		 * | Instagram TV | instagr.am                                | 5.1.0   |
+		 * | TikTok       | tiktok.com                                | 5.4.0   |
 		 *
 		 * No longer supported providers:
 		 *
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 795c730da8..e79dd339ef 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.4-alpha-47215';
+$wp_version = '5.4-alpha-47216';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.