From 69bea13a20dae51620aaa4687b090e924445d647 Mon Sep 17 00:00:00 2001
From: Forkless <REDACTED@gmail.com>
Date: Sun, 2 Nov 2014 23:22:19 -0600
Subject: [PATCH] Added support for youtube's timeslice embed parameters (start
 and end)

---
 inc/config.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/config.php b/inc/config.php
index ddf23279..655c69cc 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -999,8 +999,8 @@
 	// 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})(&.+)?$/i',
-			'<iframe style="float: left;margin: 10px 20px;" width="%%tb_width%%" height="%%tb_height%%" frameborder="0" id="ytplayer" src="http://www.youtube.com/embed/$2"></iframe>'
+			'/^https?:\/\/(?:\w+\.)?youtube\.com\/watch\?(?:&?v=([a-zA-Z0-9\-_]{10,11})|(&?start=\d*)|(&?end=\d*)|(?:&?[^&]+))*$/i',
+			'<iframe style="float: left;margin: 10px 20px;" width="%%tb_width%%" height="%%tb_height%%" frameborder="0" id="ytplayer" src="http://youtube.com/embed/$1?$2$3&rel=0&autoplay=1&html5=1"></iframe>'
 		),
 		array(
 			'/^https?:\/\/(\w+\.)?vimeo\.com\/(\d{2,10})(\?.+)?$/i',