From 5c58e618ae76df6eddcc5582b4cb29c4e0b69a4b Mon Sep 17 00:00:00 2001 From: Ruslan Kabalin Date: Thu, 26 Nov 2015 16:32:13 +0000 Subject: [PATCH] filter_jwplayer: 7-0.4 release See release notes for details. I had to refactor upgrade routine, which is very bad practice, but since (fortinately) reapplying upgrade does not break anything in our case, I decided to increment version for existing upgrade routine which was already published (though not released). The reason behind is to give more room for JW6 branch version increment and keep possible upgrading to JW7 from JW6 at any point with all required upgrade changes applied. --- db/upgrade.php | 16 ++++++---------- version.php | 6 +++--- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/db/upgrade.php b/db/upgrade.php index 4d01ed3..9b926de 100644 --- a/db/upgrade.php +++ b/db/upgrade.php @@ -32,20 +32,16 @@ function xmldb_filter_jwplayer_upgrade($oldversion) { $dbman = $DB->get_manager(); - if ($oldversion < 2015080401) { + if ($oldversion < 2015112500) { // Delete customskin file, as the setting has been removed. - $fs = get_file_storage(); - $fs->delete_area_files(context_system::instance()->id, 'filter_jwplayer', 'playerskin', 0); - unset_config('customskin', 'filter_jwplayer'); + if (get_config('filter_jwplayer', 'customskin') !== false) { + $fs = get_file_storage(); + $fs->delete_area_files(context_system::instance()->id, 'filter_jwplayer', 'playerskin', 0); + unset_config('customskin', 'filter_jwplayer'); + } // Unset other removed settings. unset_config('gatrackingobject', 'filter_jwplayer'); - - upgrade_plugin_savepoint(true, 2015080401, 'filter', 'jwplayer'); - } - - if ($oldversion < 2015112500) { - // Unset removed settings. unset_config('securehosting', 'filter_jwplayer'); unset_config('accounttoken', 'filter_jwplayer'); diff --git a/version.php b/version.php index 9b39793..40ef03a 100644 --- a/version.php +++ b/version.php @@ -25,8 +25,8 @@ defined('MOODLE_INTERNAL') || die(); -$plugin->version = 2015080401; // The current plugin version (Date: YYYYMMDDXX). -$plugin->requires = 2013111800; // Requires Moodle 2.6 +$plugin->version = 2015112500; // The current plugin version (Date: YYYYMMDDXX). +$plugin->requires = 2015051100; // Requires Moodle 2.9 $plugin->component = 'filter_jwplayer'; // Full name of the plugin (used for diagnostics). $plugin->maturity = MATURITY_STABLE; -$plugin->release = '0.3 for Moodle 2.6+ and JW Player 6'; +$plugin->release = '7-0.4 for Moodle 2.9+, JW7 CDN 7.2.2)';