From 6e7bf3963b12c1213646c468a356787e2e94e1b5 Mon Sep 17 00:00:00 2001
From: Juan Leyva <juanleyvadelgado@gmail.com>
Date: Wed, 29 Jun 2016 16:41:25 +0100
Subject: [PATCH] MDL-54869 webservice: Fix core_user_add_user_private_files

---
 user/externallib.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/user/externallib.php b/user/externallib.php
index 9260620cc880f..9a3828f79f749 100644
--- a/user/externallib.php
+++ b/user/externallib.php
@@ -977,9 +977,9 @@ public static function add_user_private_files_parameters() {
      * @since Moodle 2.6
      */
     public static function add_user_private_files($draftid) {
-        global $CFG, $USER, $DB;
+        global $CFG, $USER;
+        require_once($CFG->libdir . "/filelib.php");
 
-        require_once($CFG->dirroot . "/user/lib.php");
         $params = self::validate_parameters(self::add_user_private_files_parameters(), array('draftid' => $draftid));
 
         if (isguestuser()) {
@@ -999,10 +999,9 @@ public static function add_user_private_files($draftid) {
         $options = array('subdirs' => 1,
                          'maxbytes' => $maxbytes,
                          'maxfiles' => -1,
-                         'accepted_types' => '*',
                          'areamaxbytes' => $maxareabytes);
 
-        file_save_draft_area_files($draftid, $context->id, 'user', 'private', 0, $options);
+        file_merge_files_from_draft_area_into_filearea($draftid, $context->id, 'user', 'private', 0, $options);
 
         return null;
     }