Merge branch 'MDL-37967_24' of git://github.com/jmvedrine/moodle into MOODLE_24_STABLE

2013-02-20 00:34:36 +01:00
parent 950fead105 ddc03b10d5
commit 097404cd2b
1 changed files with 8 additions and 1 deletions
@@ -170,16 +170,23 @@ class qformat_xml extends qformat_default {
        }
        $fs = get_file_storage();
        $itemid = file_get_unused_draft_itemid();
+        $filenames = array();
        foreach ($xml as $file) {
+            $filename = $file['@']['name'];
+            if (in_array($filename, $filenames)) {
+                debugging('Duplicate file in XML: ' . $filename, DEBUG_DEVELOPER);
+                continue;
+            }
            $filerecord = array(
                'contextid' => context_user::instance($USER->id)->id,
                'component' => 'user',
                'filearea'  => 'draft',
                'itemid'    => $itemid,
                'filepath'  => '/',
-                'filename'  => $file['@']['name'],
+                'filename'  => $filename,
            );
            $fs->create_file_from_string($filerecord, base64_decode($file['#']));
+            $filenames[] = $filename;
        }
        return $itemid;
    }