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

Merge branch 'm26_MDL-40226_Add_JNLP_MIME_Type_Support' of https://github.com/scara/moodle

Browse Source 
Conflicts:
	lib/db/upgrade.php
	version.php
This commit is contained in:
Dan Poltawski
2013-10-09 16:46:56 +08:00
parent bbe834a152 fd43a49b72
commit 07b0214588
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/db/upgrade.php
+15
View File
@@ -2674,5 +2674,20 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2013100900.00);
}
if ($oldversion < 2013100901.00) {
// Fixing possible wrong MIME type for Java Network Launch Protocol (JNLP) files.
$select = $DB->sql_like('filename', '?', false);
$DB->set_field_select(
'files',
'mimetype',
'application/x-java-jnlp-file',
$select,
array('%.jnlp')
);
// Main savepoint reached.
upgrade_main_savepoint(true, 2013100901.00);
}
return true;
}
lib/filelib.php
+1
View File
@@ -1451,6 +1451,7 @@ function &get_mimetypes_array() {
'jcw' => array ('type'=>'text/xml', 'icon'=>'markup'),
'jmt' => array ('type'=>'text/xml', 'icon'=>'markup'),
'jmx' => array ('type'=>'text/xml', 'icon'=>'markup'),
'jnlp' => array ('type'=>'application/x-java-jnlp-file', 'icon'=>'markup'),
'jpe' => array ('type'=>'image/jpeg', 'icon'=>'jpeg', 'groups'=>array('image', 'web_image'), 'string'=>'image'),
'jpeg' => array ('type'=>'image/jpeg', 'icon'=>'jpeg', 'groups'=>array('image', 'web_image'), 'string'=>'image'),
'jpg' => array ('type'=>'image/jpeg', 'icon'=>'jpeg', 'groups'=>array('image', 'web_image'), 'string'=>'image'),
version.php
+1 -1
View File
@@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2013100900.00; // YYYYMMDD = weekly release date of this DEV branch.
$version = 2013100901.00; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.