From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Tue, 12 Jun 2018 16:07:02 +0000 (+0100)
Subject: lib/php/mime.php
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=6a867827919b92ac2c68c055cd9f9cfe1b23a9c6;p=nb.git

lib/php/mime.php
---

diff --git a/lib/php/mime.php b/lib/php/mime.php
index ba936a04..359b1b48 100644
--- a/lib/php/mime.php
+++ b/lib/php/mime.php
@@ -742,7 +742,7 @@ class Mime {
 					.'></iframe>',
 			],
 			'hooktube' => [
-					'exp'  => 'hooktube.com/watch\?v=([^&\s]+)',
+					'exp'  => 'hooktube.com/watch\?v=([^/&\s]+)',
 					'html' => '<iframe class="video"'
 						.' type="text/html"'
 						.' src="//hooktube.com/embed/<SRC>?enablejsapi=1&autoplay=0"'
@@ -751,7 +751,8 @@ class Mime {
 					.'></iframe>',
 			],
 			'youtube' => [
-					'exp'  => 'www.youtube.com/watch\?v=([^&\s]+)',
+					#'exp'  => 'www.youtube.com/watch\?v=([^/&\s]+)',
+					'exp'  => '(?:/watch\?v=|/video/)([^/&\s]+)',
 					'html' => '<a href="'.$str.'"><iframe class="video"'
 						.' type="text/html"'
 						.' src="//www.youtube.com/embed/<SRC>?enablejsapi=1"'