diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-05-25 20:51:43 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-05-25 20:51:43 +0000 |
| commit | d664fdcde9437007c291f7e1ad18257da20d57df (patch) | |
| tree | 54b32180d971a553bbe930301d35142ee125e9ac | |
| parent | aa18cd54c7ec55f0b326ef2e8c0302801ad2bdef (diff) | |
| download | redmine-d664fdcde9437007c291f7e1ad18257da20d57df.tar.gz redmine-d664fdcde9437007c291f7e1ad18257da20d57df.zip | |
Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9716 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/models/attachment.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/models/attachment.rb b/app/models/attachment.rb index 1eb6dc37a..8daa4cf0b 100644 --- a/app/models/attachment.rb +++ b/app/models/attachment.rb @@ -175,7 +175,7 @@ class Attachment < ActiveRecord::Base def self.find_by_token(token) if token.to_s =~ /^(\d+)\.([0-9a-f]+)$/ attachment_id, attachment_digest = $1, $2 - attachment = Attachment.first(:conditions => {:id => attachment_id, :digest => attachment_digest}) + attachment = Attachment.where(:id => attachment_id, :digest => attachment_digest).first if attachment && attachment.container.nil? attachment end @@ -200,8 +200,7 @@ class Attachment < ActiveRecord::Base end def self.prune(age=1.day) - attachments = Attachment.all(:conditions => ["created_on < ? AND (container_type IS NULL OR container_type = '')", Time.now - age]) - attachments.each(&:destroy) + Attachment.where("created_on < ? AND (container_type IS NULL OR container_type = '')", Time.now - age).destroy_all end private |