Merge pull request #7336 from eileenmcnaughton/CRM-17636

[civicrm-core.git] / api / v3 / Attachment.php

diff --git a/api/v3/Attachment.php b/api/v3/Attachment.php
index 5ca4f68c3950d287d8f31f3832618ed961f05fa2..1ae66b2651f3df12fda3baad43ce3e7a6f543b4f 100644 (file)
--- a/api/v3/Attachment.php
+++ b/api/v3/Attachment.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.6                                                |
+ | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -160,7 +160,10 @@ function civicrm_api3_attachment_create($params) {
     file_put_contents($path, $content);
   }
   elseif (is_string($moveFile)) {
-    rename($moveFile, $path);
+    // CRM-17432 Do not use rename() since it will break file permissions.
+    // Also avoid move_uplaoded_file() because the API can use options.move-file.
+    copy($moveFile, $path);
+    unlink($moveFile);
   }
 
   // Save custom field to entity