Set user id from function see BT#10936

chamilo · Apr 1, 2016 · 615a122 · 615a122
1 parent a231628
commit 615a122
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/main/inc/lib/fileUpload.lib.php b/main/inc/lib/fileUpload.lib.php
@@ -1489,7 +1489,7 @@ function create_unexisting_directory(
         $to_group_id
     );
 
-    if ($folderExists == true) {
+    if ($folderExists === true) {
         if ($generateNewNameIfExists) {
             $counter = 1;
             while (1) {
@@ -1500,7 +1500,7 @@ function create_unexisting_directory(
                     $to_group_id
                 );
 
-                if ($folderExists == false) {
+                if ($folderExists === false) {
                     break;
                 }
                 $counter++;
@@ -1529,7 +1529,7 @@ function create_unexisting_directory(
 
     if (!is_dir($base_work_dir.$systemFolderName)) {
         $result = mkdir(
-            $base_work_dir.$systemFolderName,
+            $base_work_dir . $systemFolderName,
             api_get_permissions_for_new_directories(),
             true
         );
@@ -1548,7 +1548,7 @@ function create_unexisting_directory(
 
             $rs = Database::query($sql);
             if (Database::num_rows($rs) == 0) {
-
+        
                 $document_id = add_document(
                     $_course,
                     $systemFolderName,
@@ -1558,7 +1558,9 @@ function create_unexisting_directory(
                     null,
                     0,
                     true,
-                    $to_group_id
+                    $to_group_id,
+                    $session_id,
+                    $user_id
                 );
 
                 if ($document_id) {

diff --git a/main/newscorm/learnpath.class.php b/main/newscorm/learnpath.class.php
@@ -5930,7 +5930,7 @@ public function generate_lp_folder($course, $lp_name = '', $creatorId = 0)
             if (!is_dir($filepath.'/'.$dir)) {
                 $folderData = create_unexisting_directory(
                     $course,
-                    api_get_user_id(),
+                    $creatorId,
                     0,
                     0,
                     0,
@@ -5997,7 +5997,7 @@ public function create_document($courseInfo, $content = '', $title = '', $extens
 
         if (empty($_POST['dir']) && empty($_GET['dir'])) {
             //Generates folder
-            $result = $this->generate_lp_folder($courseInfo, $creatorId);
+            $result = $this->generate_lp_folder($courseInfo, '', $creatorId);
             $dir = $result['dir'];
             $filepath = $result['filepath'];
         }