L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-57546-32' of git://github.com/andrewnicols/moodle into MOODLE_32_STABLE

Browse Source
This commit is contained in:
David Monllao
2017-07-31 14:10:12 +02:00
parent 5d65c618b4 05caa18842
commit 629dbe65bf
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
media/player/youtube/classes/plugin.php
+1 -1
View File
@@ -159,7 +159,7 @@ OET;
$shortlink = '((youtu|y2u)\.be/)';
// Initial part of link.
$start = '~^https?://(www\.)?(' . $link . '|' . $shortlink . ')';
$start = '~^https?://((www|m)\.)?(' . $link . '|' . $shortlink . ')';
// Middle bit: Video key value.
$middle = '([a-z0-9\-_]+)';
return $start . $middle . core_media_player_external::END_LINK_REGEX_PART;
media/player/youtube/tests/player_test.php
+3
View File
@@ -70,6 +70,9 @@ class media_youtube_testcase extends advanced_testcase {
$url = new moodle_url('http://www.youtube.com/v/vyrwMmsufJc');
$t = $manager->embed_url($url);
$this->assertContains('</iframe>', $t);
$url = new moodle_url('http://m.youtube.com/watch?v=vyrwMmsufJc');
$t = $manager->embed_url($url);
$this->assertContains('</iframe>', $t);
// Format: youtube video within playlist.
$url = new moodle_url('https://www.youtube.com/watch?v=dv2f_xfmbD8&index=4&list=PLxcO_MFWQBDcyn9xpbmx601YSDlDcTcr0');