moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-11 11:56:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-76974' of https://github.com/paulholden/moodle

Browse source
This commit is contained in:
Jun Pataleta 2023-08-28 17:03:27 +08:00
commit be35034f1c
No known key found for this signature in database
GPG key ID: F83510526D99E2C7
26 changed files with 213 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

6
repository/filepicker.js
View file

@ -2125,8 +2125,10 @@ M.core_filepicker.init = function(Y, options) {
},
set_preference: function(name, value) {
if (this.options.userprefs[name] != value) {
M.util.set_user_preference('filepicker_' + name, value);
this.options.userprefs[name] = value;
require(['core_user/repository'], function(UserRepository) {
UserRepository.setUserPreference('filepicker_' + name, value);
this.options.userprefs[name] = value;
}.bind(this));
}
},
in_iframe: function () {

5
repository/lib.php
View file

@ -3190,11 +3190,6 @@ function initialise_filepicker($args) {
$return->userprefs['recentlicense'] = get_user_preferences('filepicker_recentlicense', '');
$return->userprefs['recentviewmode'] = get_user_preferences('filepicker_recentviewmode', '');
user_preference_allow_ajax_update('filepicker_recentrepository', PARAM_INT);
user_preference_allow_ajax_update('filepicker_recentlicense', PARAM_SAFEDIR);
user_preference_allow_ajax_update('filepicker_recentviewmode', PARAM_INT);
// provided by form element
$return->accepted_types = file_get_typegroup('extension', $args->accepted_types);
$return->return_types = $args->return_types;