From b154ab767e9ac8e0ef7c52d45bc1260ec5ab03d1 Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Fri, 30 Sep 2016 21:42:28 +0000
Subject: [PATCH] Embeds: Add oEmbed support for User, List and Like Twitter
 timelines.

Props earnjam.
Fixes #38003.
Built from https://develop.svn.wordpress.org/trunk@38693


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

diff --git a/wp-includes/class-oembed.php b/wp-includes/class-oembed.php
index 1a227fe553..53f964a65d 100644
--- a/wp-includes/class-oembed.php
+++ b/wp-includes/class-oembed.php
@@ -72,8 +72,11 @@ class WP_oEmbed {
 			'#https?://(.+\.)?polldaddy\.com/.*#i'                => array( 'https://polldaddy.com/oembed/',                             true  ),
 			'#https?://poll\.fm/.*#i'                             => array( 'https://polldaddy.com/oembed/',                             true  ),
 			'#https?://(www\.)?funnyordie\.com/videos/.*#i'       => array( 'http://www.funnyordie.com/oembed',                          true  ),
-			'#https?://(www\.)?twitter\.com/.+?/status(es)?/.*#i' => array( 'https://publish.twitter.com/oembed',                        true  ),
-			'#https?://(www\.)?twitter\.com/.+?/timelines/.*#i'   => array( 'https://publish.twitter.com/oembed',                        true  ),
+			'#https?://(www\.)?twitter\.com/\w{1,15}/status(es)?/.*#i' => array( 'https://publish.twitter.com/oembed',                        true  ),
+			'#https?://(www\.)?twitter\.com/\w{1,15}$#i'               => array( 'https://publish.twitter.com/oembed',                        true  ),
+			'#https?://(www\.)?twitter\.com/\w{1,15}/likes$#i'         => array( 'https://publish.twitter.com/oembed',                        true  ),
+			'#https?://(www\.)?twitter\.com/\w{1,15}/lists/.*#i'       => array( 'https://publish.twitter.com/oembed',                        true  ),
+			'#https?://(www\.)?twitter\.com/\w{1,15}/timelines/.*#i'   => array( 'https://publish.twitter.com/oembed',                        true  ),
 			'#https?://(www\.)?twitter\.com/i/moments/.*#i'       => array( 'https://publish.twitter.com/oembed',                        true  ),
 			'#https?://vine\.co/v/.*#i'                           => array( 'https://vine.co/oembed.{format}',                           true  ),
 			'#https?://(www\.)?soundcloud\.com/.*#i'              => array( 'https://soundcloud.com/oembed',                             true  ),
@@ -175,6 +178,9 @@ class WP_oEmbed {
 		 * | Twitter      | twitter.com/timelines |      Yes       | 4.5.0     |
 		 * | Twitter      | twitter.com/moments   |      Yes       | 4.5.0     |
 		 * | Facebook     | facebook.com          |      Yes       | 4.7.0     |
+		 * | Twitter      | twitter.com/user      |      Yes       | 4.7.0     |
+		 * | Twitter      | twitter.com/likes     |      Yes       | 4.7.0     |
+		 * | Twitter      | twitter.com/lists     |      Yes       | 4.7.0     |
 		 *
 		 * No longer supported providers:
 		 *
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 7f7bd13fdc..ecefb5e86a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-alpha-38692';
+$wp_version = '4.7-alpha-38693';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.