diff options
author | webchick <webchick@24967.no-reply.drupal.org> | 2012-04-26 11:33:42 -0700 |
---|---|---|
committer | webchick <webchick@24967.no-reply.drupal.org> | 2012-04-26 11:33:42 -0700 |
commit | 6af9c29d6338cb634906b48819ea2840fe15ff3f (patch) | |
tree | 0a4e1311858e8b9dd00f6ab4dd8f377013da8e08 /modules/system/system.install | |
parent | 3a928db5053d17b36d73af9689059e4be5b8dcb6 (diff) | |
download | brdo-6af9c29d6338cb634906b48819ea2840fe15ff3f.tar.gz brdo-6af9c29d6338cb634906b48819ea2840fe15ff3f.tar.bz2 |
Issue #1542854 by drumm, BTMash: Fixed system_update_7061() converts filepaths too aggressively.
Diffstat (limited to 'modules/system/system.install')
-rw-r--r-- | modules/system/system.install | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/system/system.install b/modules/system/system.install index 0b4e1faa1..6161eb333 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -2791,7 +2791,7 @@ function system_update_7061(&$sandbox) { foreach ($revision['file'][LANGUAGE_NONE] as $delta => $file) { // We will convert filepaths to uri using the default scheme // and stripping off the existing file directory path. - $file['uri'] = $scheme . str_replace($basename, '', $file['filepath']); + $file['uri'] = $scheme . preg_replace('!^' . $basename . '!', '', $file['filepath']); $file['uri'] = file_stream_wrapper_uri_normalize($file['uri']); unset($file['filepath']); // Insert into the file_managed table. |