From c83680113b02bd8d4f14b0257bf56068e8724cea Mon Sep 17 00:00:00 2001 From: Bob Vincent Date: Sat, 14 May 2011 14:34:10 -0400 Subject: [PATCH] Issue #1005574 by pillarsdotnet: Only variables should be passed by reference. --- filefield_paths.module | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/filefield_paths.module b/filefield_paths.module index eb53ba7d57323e8609083a9db52c0a7b715d487a..3ec537990114941c6e3315950591327c2983ce08 100644 --- a/filefield_paths.module +++ b/filefield_paths.module @@ -434,8 +434,9 @@ function filefield_paths_filefield_paths_process_file($new, &$file, $settings, & $file['filepath']['new'] = file_uri_scheme($file['field']['uri']) . '://' . filefield_paths_process_string($settings['filepath']['value'] . '/' . $file['filename']['new'], $token_data, $settings['filepath']); // Finalize files if necessary. - if (dirname($file['filepath']['new']) != dirname($file['field']['uri']) || $file['filename']['new'] != $file['field']['uri']) { - if (file_prepare_directory(dirname($file['filepath']['new']), FILE_CREATE_DIRECTORY) && file_move((object) $file['field'], $file['filepath']['new'])) { + $dirname = dirname($file['filepath']['new']); + if ($dirname != dirname($file['field']['uri']) || $file['filename']['new'] != $file['field']['uri']) { + if (file_prepare_directory($dirname, FILE_CREATE_DIRECTORY) && file_move((object) $file['field'], $file['filepath']['new'])) { // Fix reference to old paths. $file_directory_path = file_uri_scheme($file['field']['uri']) !== 'private' -- 1.7.4.1