From 19e75805b030b45ee6fe6348cdfbd7e07b6940b0 Mon Sep 17 00:00:00 2001
From: audrasjb <audrasjb@git.wordpress.org>
Date: Fri, 13 Jan 2023 13:19:13 +0000
Subject: [PATCH] Bundled Themes: Add Mastodon domains for menu item icons.

This changeset adds the top 10 Mastodon domains by popularity to Twenty Twenty and Twenty Twenty-One Social icon feature.

Note: other Mastodon domains can be added to the array of domain mapping using `twentytwenty_social_icons_map` and `twenty_twenty_one_social_icons_map` filters.

Props triumvirate, sabernhardt, audrasjb, peterwilsoncc, rryyaanndd, ianbelanger.
Fixes #57293, #49099.

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


git-svn-id: http://core.svn.wordpress.org/trunk@54594 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 .../classes/class-twentytwenty-svg-icons.php         | 12 ++++++++++++
 .../classes/class-twenty-twenty-one-svg-icons.php    | 12 ++++++++++++
 wp-includes/version.php                              |  2 +-
 3 files changed, 25 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 714b3a1454..0e576f0af6 100644
--- a/wp-content/themes/twentytwenty/classes/class-twentytwenty-svg-icons.php
+++ b/wp-content/themes/twentytwenty/classes/class-twentytwenty-svg-icons.php
@@ -214,6 +214,18 @@ if ( ! class_exists( 'TwentyTwenty_SVG_Icons' ) ) {
 			'mail'      => array(
 				'mailto:',
 			),
+			'mastodon'  => array(
+				'mastodon.social',
+				'pawoo.net',
+				'mstdn.jp',
+				'mastodon.cloud',
+				'mastodon.online',
+				'counter.social',
+				'mstdn.social',
+				'mas.to',
+				'mastodon.world',
+				'gc2.jp',
+			),
 			'pocket'    => array(
 				'getpocket.com',
 			),
diff --git a/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-svg-icons.php b/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-svg-icons.php
index 3a82cf76ab..d88aabc094 100644
--- a/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-svg-icons.php
+++ b/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-svg-icons.php
@@ -127,6 +127,18 @@ class Twenty_Twenty_One_SVG_Icons {
 		'mail'      => array(
 			'mailto:',
 		),
+		'mastodon'  => array(
+			'mastodon.social',
+			'pawoo.net',
+			'mstdn.jp',
+			'mastodon.cloud',
+			'mastodon.online',
+			'counter.social',
+			'mstdn.social',
+			'mas.to',
+			'mastodon.world',
+			'gc2.jp',
+		),
 		'pocket'    => array(
 			'getpocket.com',
 		),
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 31b4e0d4fa..a6fe56a4c3 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.2-alpha-55060';
+$wp_version = '6.2-alpha-55061';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.