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

Merge branch 'MDL-28099_wip' of git://github.com/jamiepratt/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2011-07-01 00:54:35 +02:00
parent 7ace3a2199 5b5206e1cb
commit f9d2eb4f20
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/form/filepicker.php
+7 -5
View File
@@ -112,9 +112,13 @@ class MoodleQuickForm_filepicker extends HTML_QuickForm_input {
function exportValue(&$submitValues, $assoc = false) {
global $USER;
$draftitemid = $this->_findValue($submitValues);
if (null === $draftitemid) {
$draftitemid = $this->getValue();
}
// make sure max one file is present and it is not too big
if (!empty($submitValues[$this->_attributes['name']])) {
$draftitemid = $submitValues[$this->_attributes['name']];
if (!is_null($draftitemid)) {
$fs = get_file_storage();
$usercontext = get_context_instance(CONTEXT_USER, $USER->id);
if ($files = $fs->get_area_files($usercontext->id, 'user', 'draft', $draftitemid, 'id DESC', false)) {
@@ -128,10 +132,8 @@ class MoodleQuickForm_filepicker extends HTML_QuickForm_input {
$file->delete();
}
}
return array($this->_attributes['name'] => $submitValues[$this->_attributes['name']]);
} else {
return null;
}
return $this->_prepareValue($draftitemid, true);
}
}