Browse Source

oops... missed an uploader bug

Stephen Ficklin 7 years ago
parent
commit
2454d17286
1 changed files with 15 additions and 14 deletions
  1. 15 14
      tripal/tripal.module

+ 15 - 14
tripal/tripal.module

@@ -970,18 +970,10 @@ function tripal_handle_uploaded_file($filename, $filepath, $type) {
 
   global $user;
 
-  // Create a file object.
-  $file = new stdClass();
-  $file->uri = $filepath;
-  $file->filename = $filename;
-  $file->filemime = file_get_mimetype($filepath);
-  $file->uid = $user->uid;
-  $file->status = FILE_STATUS_PERMANENT;
-  $file = file_save($file);
-
   // Split the type into a node ID and form_key
   list($id, $form_key) = explode('-', $type);
 
+
   // See if this file is already managed then add another entry fin the
   // usage table.
   $fid = db_select('file_managed', 'fm')
@@ -990,13 +982,22 @@ function tripal_handle_uploaded_file($filename, $filepath, $type) {
     ->execute()
     ->fetchField();
 
-  if ($fid) {
-    $file = file_load($fid);
-    file_usage_add($file, 'tripal', $form_key, $id);
-    return $fid;
+  // Create a file object.
+  if (!$fid) {
+    $file = new stdClass();
+    $file->uri = $filepath;
+    $file->filename = $filename;
+    $file->filemime = file_get_mimetype($filepath);
+    $file->uid = $user->uid;
+    $file->status = FILE_STATUS_PERMANENT;
+    $file = file_save($file);
+    $fid = $file->fid;
   }
 
-  return $file->fid;
+  $file = file_load($fid);
+  file_usage_add($file, 'tripal', $form_key, $id);
+  return $fid;
+
 }
 
 /**