Mercurial > hg > soundsoftware-site

diff app/models/.svn/text-base/attachment.rb.svn-base @ 246:eeebe205a056 cannam

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Merge from default branch, bringing us up to SVN trunk rev 4993
author Chris Cannam
date Thu, 03 Mar 2011 12:02:03 +0000
parents 0579821a129a
children cbce1fd3b1b7
line wrap: on
line diff
--- a/app/models/.svn/text-base/attachment.rb.svn-base	Thu Jan 20 09:59:02 2011 +0000
+++ b/app/models/.svn/text-base/attachment.rb.svn-base	Thu Mar 03 12:02:03 2011 +0000
@@ -43,7 +43,7 @@
                                                         "LEFT JOIN #{Project.table_name} ON #{Document.table_name}.project_id = #{Project.table_name}.id"}
 
   cattr_accessor :storage_path
-  @@storage_path = "#{RAILS_ROOT}/files"
+  @@storage_path = Redmine::Configuration['attachments_storage_path'] || "#{RAILS_ROOT}/files"
   
   def validate
     if self.filesize > Setting.attachment_max_size.to_i.kilobytes