lib/php/mime.php

diff --git a/lib/php/mime.php b/lib/php/mime.php
index ba936a04d6f1d740bae551c5b37f61870a543c6e..359b1b484ac091b4994a83690c9a392954c15bcb 100644 (file)
--- 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"'