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

Merge branch 'MDL-45134-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

Browse Source
This commit is contained in:
Marina Glancy
2014-04-23 14:46:57 +08:00
parent 5c50050133 af91288814
commit ba7a72d413
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/adminlib.php
+4 -8
View File
@@ -8270,13 +8270,7 @@ class admin_setting_configstoredfile extends admin_setting {
// Let's not deal with validation here, this is for admins only.
$current = $this->get_setting();
if (empty($data)) {
// Most probably applying default settings.
if ($current === null) {
return ($this->config_write($this->name, '') ? '' : get_string('errorsetting', 'admin'));
}
return '';
} else if (!is_number($data)) {
if (!is_number($data)) {
// Draft item id is expected here!
return get_string('errorsetting', 'admin');
}
@@ -8296,8 +8290,10 @@ class admin_setting_configstoredfile extends admin_setting {
if ($fs->file_exists($options['context']->id, $component, $this->filearea, $this->itemid, '/', '.')) {
// Make sure the settings form was not open for more than 4 days and draft areas deleted in the meantime.
// But we can safely ignore that if the destination area is empty, so that the user is not prompt
// with an error because the draft area does not exist, as he did not use it.
$usercontext = context_user::instance($USER->id);
if (!$fs->file_exists($usercontext->id, 'user', 'draft', $data, '/', '.')) {
if (!$fs->file_exists($usercontext->id, 'user', 'draft', $data, '/', '.') && $current !== '') {
return get_string('errorsetting', 'admin');
}
}