mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 00:12:56 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-67057-master' of git://github.com/andrewnicols/moodle

Browse Source
This commit is contained in:
Adrian Greeve 2019-11-07 11:59:00 +08:00
commit d5e303f8e3
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
h5p/classes/helper.php
View File

@ -51,6 +51,7 @@ class helper {
\core_php_time_limit::raise();
$core = $factory->get_core();
$core->h5pF->set_file($file);
$path = $core->fs->getTmpPath();
$core->h5pF->getUploadedH5pFolderPath($path);
// Add manually the extension to the file to avoid the validation fails.

3
h5p/classes/player.php
View File

@ -285,9 +285,6 @@ class player {
// content-type libraries exist, to avoid users without the h5p:updatelibraries capability upload malicious content.
$onlyupdatelibs = !helper::can_update_library($file);
// Set the .h5p file, in order to check later the permissions to update libraries.
$this->core->h5pF->set_file($file);
// Validate and store the H5P content before displaying it.
$h5pid = helper::save_h5p($this->factory, $file, $config, $onlyupdatelibs, false);
if (!$h5pid && $file->get_userid() != $USER->id && has_capability('moodle/h5p:updatelibraries', $this->context)) {