diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2017-07-01 00:13:50 +0200 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2017-07-01 00:13:50 +0200 |
| commit | ce44746ea3a98fab1af65c75ec32eeadd67b1b5f (patch) | |
| tree | ae711e347cfc6cbbbb46c36d18b06163d148e46e | |
| parent | 3959d32aa09206518f4c1ea2cd96fa62be383dcd (diff) | |
| download | rails-ce44746ea3a98fab1af65c75ec32eeadd67b1b5f.tar.gz rails-ce44746ea3a98fab1af65c75ec32eeadd67b1b5f.tar.bz2 rails-ce44746ea3a98fab1af65c75ec32eeadd67b1b5f.zip | |
No need to normalize since we generate our own keys
| -rw-r--r-- | lib/active_file/site.rb | 6 | ||||
| -rw-r--r-- | lib/active_file/sites/disk_site.rb | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/lib/active_file/site.rb b/lib/active_file/site.rb index 8a915c2e17..7a3b1f14ba 100644 --- a/lib/active_file/site.rb +++ b/lib/active_file/site.rb @@ -27,10 +27,4 @@ class ActiveFile::Site def move(from_key:, to_key:) end - - private - def normalize_key(key) - # disallow "." and ".." segments in the key - key.split(%r[/]).reject { |s| s == "." || s == ".." } - end end diff --git a/lib/active_file/sites/disk_site.rb b/lib/active_file/sites/disk_site.rb index 71dc8d078b..da9c44a612 100644 --- a/lib/active_file/sites/disk_site.rb +++ b/lib/active_file/sites/disk_site.rb @@ -40,7 +40,7 @@ class ActiveFile::Sites::DiskSite < ActiveFile::Site private def path_for(key) - File.join(root, folder_for(key), normalize(key)) + File.join(root, folder_for(key), key) end def folder_for(key) |