From 774f58a29cbe615d8c6455fa0e89cf9ea341cc5d Mon Sep 17 00:00:00 2001
From: Benni Mack <benni@typo3.org>
Date: Wed, 5 Jul 2023 18:47:08 +0200
Subject: [PATCH] [BUGFIX] Allow to include YouTube shorts

Kudos to Georg Ringer for the hint.

Resolves: #98600
Releases: main, 12.4, 11.5
Change-Id: I1c200b4a8835bdccc4e9dc2cf2cee423459a13c4
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/79746
Tested-by: core-ci <typo3@b13.com>
Tested-by: Oliver Bartsch <bo@cedev.de>
Reviewed-by: Oliver Bartsch <bo@cedev.de>
---
 .../Classes/Resource/OnlineMedia/Helpers/YouTubeHelper.php     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/typo3/sysext/core/Classes/Resource/OnlineMedia/Helpers/YouTubeHelper.php b/typo3/sysext/core/Classes/Resource/OnlineMedia/Helpers/YouTubeHelper.php
index 3789eb55f4e3..f794a6382fba 100644
--- a/typo3/sysext/core/Classes/Resource/OnlineMedia/Helpers/YouTubeHelper.php
+++ b/typo3/sysext/core/Classes/Resource/OnlineMedia/Helpers/YouTubeHelper.php
@@ -78,7 +78,8 @@ class YouTubeHelper extends AbstractOEmbedHelper
         // - www.youtube.com/v/<code>
         // - www.youtube-nocookie.com/v/<code> # youtube-nocookie.com web link
         // - www.youtube.com/embed/<code> # URL form iframe embed code, can also get code from full iframe snippet
-        if (preg_match('%(?:youtube(?:-nocookie)?\.com/(?:[^/]+/.+/|(?:v|e(?:mbed)?)/|.*[?&]v=)|youtu\.be/)([^"&?/ ]{11})%i', $url, $match)) {
+        // - www.youtube.com/shorts/<code>
+        if (preg_match('%(?:youtube(?:-nocookie)?\.com/(?:[^/]+/.+/|(?:v|e(?:mbed)?|shorts)/|.*[?&]v=)|youtu\.be/)([^"&?/ ]{11})%i', $url, $match)) {
             $videoId = $match[1];
         }
         if (empty($videoId)) {
-- 
GitLab