From 5116ed9ebb099e06fc0ecb3f39024c97e5d50c32 Mon Sep 17 00:00:00 2001
From: ianbelanger <ianbelanger@git.wordpress.org>
Date: Thu, 16 Apr 2020 19:01:09 +0000
Subject: [PATCH] Bundled Themes: Twenty Twenty add TikTok to the social icon
 menu.

This adds TikTok as an option in the social icon menu.

Props mislavjuric, poena, audrasjb.
Fixes #49893.
Built from https://develop.svn.wordpress.org/trunk@47589


git-svn-id: http://core.svn.wordpress.org/trunk@47364 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 .../twentytwenty/classes/class-twentytwenty-svg-icons.php    | 5 +++++
 wp-content/themes/twentytwenty/readme.txt                    | 5 +++++
 wp-includes/version.php                                      | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/wp-content/themes/twentytwenty/classes/class-twentytwenty-svg-icons.php b/wp-content/themes/twentytwenty/classes/class-twentytwenty-svg-icons.php
index 025ad9f844..7d23da09d2 100644
--- a/wp-content/themes/twentytwenty/classes/class-twentytwenty-svg-icons.php
+++ b/wp-content/themes/twentytwenty/classes/class-twentytwenty-svg-icons.php
@@ -161,6 +161,9 @@ if ( ! class_exists( 'TwentyTwenty_SVG_Icons' ) ) {
 			'pocket'    => array(
 				'getpocket.com',
 			),
+			'tiktok'    => array(
+				'tiktok.com',
+			),
 			'twitch'    => array(
 				'twitch.tv',
 			),
@@ -238,6 +241,8 @@ if ( ! class_exists( 'TwentyTwenty_SVG_Icons' ) ) {
 
 			'tumblr'     => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M16.749,17.396c-0.357,0.17-1.041,0.319-1.551,0.332c-1.539,0.041-1.837-1.081-1.85-1.896V9.847h3.861V6.937h-3.847V2.039 c0,0-2.77,0-2.817,0c-0.046,0-0.127,0.041-0.138,0.144c-0.165,1.499-0.867,4.13-3.783,5.181v2.484h1.945v6.282 c0,2.151,1.587,5.206,5.775,5.135c1.413-0.024,2.982-0.616,3.329-1.126L16.749,17.396z"></path></svg>',
 
+			'tiktok'     => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M12.53.02C13.84 0 15.14.01 16.44 0c.08 1.53.63 3.09 1.75 4.17c1.12 1.11 2.7 1.62 4.24 1.79v4.03c-1.44-.05-2.89-.35-4.2-.97c-.57-.26-1.1-.59-1.62-.93c-.01 2.92.01 5.84-.02 8.75c-.08 1.4-.54 2.79-1.35 3.94c-1.31 1.92-3.58 3.17-5.91 3.21c-1.43.08-2.86-.31-4.08-1.03c-2.02-1.19-3.44-3.37-3.65-5.71c-.02-.5-.03-1-.01-1.49c.18-1.9 1.12-3.72 2.58-4.96c1.66-1.44 3.98-2.13 6.15-1.72c.02 1.48-.04 2.96-.04 4.44c-.99-.32-2.15-.23-3.02.37c-.63.41-1.11 1.04-1.36 1.75c-.21.51-.15 1.07-.14 1.61c.24 1.64 1.82 3.02 3.5 2.87c1.12-.01 2.19-.66 2.77-1.61c.19-.33.4-.67.41-1.06c.1-1.79.06-3.57.07-5.36c.01-4.03-.01-8.05.02-12.07z" /></svg>',
+
 			'twitch'     => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M16.499,8.089h-1.636v4.91h1.636V8.089z M12,8.089h-1.637v4.91H12V8.089z M4.228,3.178L3,6.451v13.092h4.499V22h2.456 l2.454-2.456h3.681L21,14.636V3.178H4.228z M19.364,13.816l-2.864,2.865H12l-2.453,2.453V16.68H5.863V4.814h13.501V13.816z"></path></svg>',
 
 			'twitter'    => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M22.23,5.924c-0.736,0.326-1.527,0.547-2.357,0.646c0.847-0.508,1.498-1.312,1.804-2.27 c-0.793,0.47-1.671,0.812-2.606,0.996C18.324,4.498,17.257,4,16.077,4c-2.266,0-4.103,1.837-4.103,4.103 c0,0.322,0.036,0.635,0.106,0.935C8.67,8.867,5.647,7.234,3.623,4.751C3.27,5.357,3.067,6.062,3.067,6.814 c0,1.424,0.724,2.679,1.825,3.415c-0.673-0.021-1.305-0.206-1.859-0.513c0,0.017,0,0.034,0,0.052c0,1.988,1.414,3.647,3.292,4.023 c-0.344,0.094-0.707,0.144-1.081,0.144c-0.264,0-0.521-0.026-0.772-0.074c0.522,1.63,2.038,2.816,3.833,2.85 c-1.404,1.1-3.174,1.756-5.096,1.756c-0.331,0-0.658-0.019-0.979-0.057c1.816,1.164,3.973,1.843,6.29,1.843 c7.547,0,11.675-6.252,11.675-11.675c0-0.178-0.004-0.355-0.012-0.531C20.985,7.47,21.68,6.747,22.23,5.924z"></path></svg>',
diff --git a/wp-content/themes/twentytwenty/readme.txt b/wp-content/themes/twentytwenty/readme.txt
index 35acca2382..41437b5d97 100644
--- a/wp-content/themes/twentytwenty/readme.txt
+++ b/wp-content/themes/twentytwenty/readme.txt
@@ -77,6 +77,11 @@ License: MIT License, https://opensource.org/licenses/MIT
 Source: https://feathericons.com
 Used for post meta icons, and the link icon in the social menu.
 
+Flaticon Icons
+License: Creative Commons BY 3.0, http://creativecommons.org/licenses/by/3.0/
+Source: Made by Freepik (https://www.flaticon.com/authors/freepik) for Flaticon (http://www.flaticon.com)
+Used for Tik Tok social icon.
+
 Social Icons
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 2693034d81..a37fbc47e8 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.5-alpha-47588';
+$wp_version = '5.5-alpha-47589';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.