summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathaniel2011-12-20 05:50:23 (GMT)
committerNathaniel2011-12-20 05:50:23 (GMT)
commit65a31d6858039e7ff983f61a9f53063e75ccbc5a (patch)
treeb1f77835481058e0ebbca77edce5a73915da8024
parentd8ca025908b6b39b6837acd1612cffcad13ec845 (diff)
Issue #1240256 by lyricnz, Akaoni: Fixed file_unmanaged_copy() Fails with Drupal 7.7+ and safe_mode() or open_basedir().
-rw-r--r--core/includes/file.inc12
1 files changed, 10 insertions, 2 deletions
diff --git a/core/includes/file.inc b/core/includes/file.inc
index 645c64b..babf465 100644
--- a/core/includes/file.inc
+++ b/core/includes/file.inc
@@ -828,6 +828,10 @@ function file_valid_uri($uri) {
* is reported.
* - If file already exists in $destination either the call will error out,
* replace the file or rename the file based on the $replace parameter.
+ * - Provides a fallback using realpaths if the move fails using stream
+ * wrappers. This can occur because PHP's copy() function does not properly
+ * support streams if safe_mode or open_basedir are enabled. See
+ * https://bugs.php.net/bug.php?id=60456
*
* @param $source
* A string specifying the filepath or URI of the source file.
@@ -907,8 +911,12 @@ function file_unmanaged_copy($source, $destination = NULL, $replace = FILE_EXIST
file_ensure_htaccess();
// Perform the copy operation.
if (!@copy($source, $destination)) {
- watchdog('file', 'The specified file %file could not be copied to %destination.', array('%file' => $source, '%destination' => $destination), WATCHDOG_ERROR);
- return FALSE;
+ // If the copy failed and realpaths exist, retry the operation using them
+ // instead.
+ if ($real_source === FALSE || $real_destination === FALSE || !@copy($real_source, $real_destination)) {
+ watchdog('file', 'The specified file %file could not be copied to %destination.', array('%file' => $source, '%destination' => $destination), WATCHDOG_ERROR);
+ return FALSE;
+ }
}
// Set the permissions on the new file.