From b23b9a5b387026172cf00451d17af3ebd1ed8b67 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Fri, 4 Nov 2016 17:14:24 +0100 Subject: [PATCH] MDL-38158 core_media: bump upgrade / version and fix filter test --- filter/mediaplugin/tests/filter_test.php | 3 ++- lib/db/upgrade.php | 4 ++-- version.php | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/filter/mediaplugin/tests/filter_test.php b/filter/mediaplugin/tests/filter_test.php index 512fb1f41e1..d981582b0e1 100644 --- a/filter/mediaplugin/tests/filter_test.php +++ b/filter/mediaplugin/tests/filter_test.php @@ -34,8 +34,9 @@ class filter_mediaplugin_testcase extends advanced_testcase { function test_filter_mediaplugin_link() { $this->resetAfterTest(true); - // we need to enable the plugins somehow + // we need to enable the plugins somehow and the flash fallback. \core\plugininfo\media::set_enabled_plugins('vimeo,youtube,videojs,html5video,swf,html5audio'); + set_config('useflash', true, 'media_videojs'); $filterplugin = new filter_mediaplugin(null, array()); diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index f1c24336979..821c37e65bf 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -2322,7 +2322,7 @@ function xmldb_main_upgrade($oldversion) { upgrade_main_savepoint(true, 2016110300.00); } - if ($oldversion < 2016110400.01) { + if ($oldversion < 2016110500.00) { $oldplayers = [ 'vimeo' => null, @@ -2389,7 +2389,7 @@ function xmldb_main_upgrade($oldversion) { } // Savepoint reached. - upgrade_main_savepoint(true, 2016110400.01); + upgrade_main_savepoint(true, 2016110500.00); } return true; diff --git a/version.php b/version.php index 84c1ef847e5..75929538db6 100644 --- a/version.php +++ b/version.php @@ -29,7 +29,7 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2016110400.01; // YYYYMMDD = weekly release date of this DEV branch. +$version = 2016110500.00; // YYYYMMDD = weekly release date of this DEV branch. // RR = release increments - 00 in DEV branches. // .XX = incremental changes. -- 2.11.4.GIT