aboutsummaryrefslogtreecommitdiffstats
path: root/app/models
diff options
context:
space:
mode:
authorRobin Houston <robin.houston@gmail.com>2012-06-03 14:28:43 +0100
committerRobin Houston <robin.houston@gmail.com>2012-06-03 14:28:43 +0100
commit0806fcc7d477b45d158e8a152b1f927f395d3aa7 (patch)
tree3fc0d5028a42c3a9f7971a349d67d90ab071a223 /app/models
parent775e122cb4824c9734f50db0dd2967779636080e (diff)
File.dirname(__FILE__) is not necessarily absolute
It’s weird that there’s so much code here that implicitly assumes File.dirname(__FILE__) is an absolute path, because really in general it very much is not! This assumption was invalidated by the recent bundler-awareness changes.
Diffstat (limited to 'app/models')
-rw-r--r--app/models/foi_attachment.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/foi_attachment.rb b/app/models/foi_attachment.rb
index f3e3d7e00..9bbf0988f 100644
--- a/app/models/foi_attachment.rb
+++ b/app/models/foi_attachment.rb
@@ -42,7 +42,7 @@ class FoiAttachment < ActiveRecord::Base
if rails_env.nil? || rails_env.empty?
raise "$RAILS_ENV is not set"
end
- base_dir = File.join(File.dirname(__FILE__), "../../cache", "attachments_#{rails_env}")
+ base_dir = File.expand_path(File.join(File.dirname(__FILE__), "../../cache", "attachments_#{rails_env}"))
return File.join(base_dir, self.hexdigest[0..2])
end