moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 17:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'wip-MDL-56855-master' of https://github.com/marinaglancy/moodle

Browse source
This commit is contained in:
Dan Poltawski 2016-11-10 08:14:42 +00:00
commit fd9eb89022
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
filter/mediaplugin/tests/filter_test.php
View file

@ -52,7 +52,7 @@ class filter_mediaplugin_testcase extends advanced_testcase {
$validtexts = array (
'<a href="http://moodle.org/testfile/test.mp3">test mp3</a>',
'<a href="http://moodle.org/testfile/test.ogg">test ogg</a>',
'<a id="movie player" class="center" href="http://moodle.org/testfile/test.mpg">test mpg</a>',
'<a id="movie player" class="center" href="http://moodle.org/testfile/test.mp4">test mp4</a>',
'<a href="http://moodle.org/testfile/test.webm">test</a>',
'<a href="http://www.youtube.com/watch?v=JghQgA2HMX8" class="href=css">test file</a>',
'<a href="http://www.youtube-nocookie.com/watch?v=JghQgA2HMX8" class="href=css">test file</a>',

2
media/player/videojs/settings.php
View file

@ -29,7 +29,7 @@ if ($ADMIN->fulltree) {
$settings->add(new admin_setting_configtext('media_videojs/videoextensions',
new lang_string('videoextensions', 'media_videojs'),
new lang_string('configvideoextensions', 'media_videojs'),
'.mov, .mp4, .m4v, .mpeg, .mpe, .mpg, .ogv, .webm, .flv, .f4v'));
'.mov, .mp4, .m4v, .ogv, .webm, .flv, .f4v'));
$settings->add(new admin_setting_configtext('media_videojs/audioextensions',
new lang_string('audioextensions', 'media_videojs'),