mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-23 09:00:30 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-68356-master' of git://github.com/cescobedo/moodle

Browse Source
This commit is contained in:
Jun Pataleta 2020-04-21 09:24:54 +08:00 committed by Adrian Greeve
commit 31066f91bd
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/classes/filetypes.php
View File

@ -115,7 +115,7 @@ abstract class core_filetypes {
'gzip' => array('type' => 'application/g-zip', 'icon' => 'archive',
'groups' => array('archive'), 'string' => 'archive'),
'h' => array('type' => 'text/plain', 'icon' => 'sourcecode'),
'h5p' => array('type' => 'application/zip', 'icon' => 'h5p', 'string' => 'archive'),
'h5p' => array('type' => 'application/zip.h5p', 'icon' => 'h5p', 'string' => 'archive'),
'hpp' => array('type' => 'text/plain', 'icon' => 'sourcecode'),
'hqx' => array('type' => 'application/mac-binhex40', 'icon' => 'archive',
'groups' => array('archive'), 'string' => 'archive'),

15
lib/db/upgrade.php
View File

@ -2291,5 +2291,20 @@ function xmldb_main_upgrade($oldversion) {
// Main savepoint reached.
upgrade_main_savepoint(true, 2020041500.00);
}
if ($oldversion < 2020041700.01) {
// Upgrade h5p MIME type for existing h5p files.
$select = $DB->sql_like('filename', '?', false);
$DB->set_field_select(
'files',
'mimetype',
'application/zip.h5p',
$select,
array('%.h5p')
);
upgrade_main_savepoint(true, 2020041700.01);
}
return true;
}

2
version.php
View File

@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2020041700.00; // YYYYMMDD = weekly release date of this DEV branch.
$version = 2020041700.01; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.
$release = '3.9dev (Build: 20200417)'; // Human-friendly version name