From c009543ce181e7192e4b2869318b355c52a023c1 Mon Sep 17 00:00:00 2001 From: Forkless Date: Mon, 3 Nov 2014 09:30:15 -0600 Subject: [PATCH] Re-added support for youtu.be shortURLs --- inc/config.php | 4 ++-- inc/instance-config.php | 2 +- js/youtube.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/inc/config.php b/inc/config.php index 9f62a19d..10c9faa5 100644 --- a/inc/config.php +++ b/inc/config.php @@ -999,7 +999,7 @@ // It's very important that you match the entire input (with ^ and $) or things will not work correctly. $config['embedding'] = array( array( - '/^https?:\/\/(?:\w+\.)?youtube\.com\/watch\?(?:&?v=([a-zA-Z0-9\-_]{10,11})|(&?start=\d*)|(&?end=\d*)|(?:&?[^&]+))*$/i', + '/^https?:\/\/(?:\w+\.)?(?:youtube\.com\/watch\?|youtu\.be\/)(?:(?:&?v=)?([a-zA-Z0-9\-_]{10,11})\??|&?(start=\d*)|&?(end=\d*)|(?:&?[^&]+))*$/i', '' ), array( @@ -1657,7 +1657,7 @@ $config['board_regex'] = '[0-9a-zA-Z$_\x{0080}-\x{FFFF}]{1,58}'; // Youtube.js embed HTML code - $config['youtube_js_html'] = '
'. + $config['youtube_js_html'] = ''; diff --git a/inc/instance-config.php b/inc/instance-config.php index f6b4d0b6..5076da2a 100644 --- a/inc/instance-config.php +++ b/inc/instance-config.php @@ -162,7 +162,7 @@ $config['embedding'] = array( array( - '/^https?:\/\/(\w+\.)?(?:youtube\.com\/watch\?v=|youtu\.be\/)([a-zA-Z0-9\-_]{10,11})(&.+)?$/i', + '/^https?:\/\/(?:\w+\.)?(?:youtube\.com\/watch\?|youtu\.be\/)(?:(?:&?v=)?([a-zA-Z0-9\-_]{10,11})\??|&?(start=\d*)|&?(end=\d*)|(?:&?[^&]+))*$/i', $config['youtube_js_html'] ), array( diff --git a/js/youtube.js b/js/youtube.js index 8aa03211..c4ef77fb 100644 --- a/js/youtube.js +++ b/js/youtube.js @@ -28,7 +28,7 @@ onready(function(){ $('div.video-container a', tag).click(function() { $(this.parentNode).html('