aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-05-02 16:06:38 +0100
committerLouise Crow <louise.crow@gmail.com>2013-05-02 16:06:38 +0100
commit9aac71037381741383190b30a053b67c46ecb407 (patch)
treef681875813e7e343853e46ce7751be432c73424f
parent81c05a2e2b66270056b19572551398a4da9e6858 (diff)
Update RAILS_ROOT to Rails.root
-rw-r--r--vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb b/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb
index 725f53512..62adbaea2 100644
--- a/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb
+++ b/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb
@@ -92,12 +92,12 @@ module ActsAsXapian
raise "Set RAILS_ENV, so acts_as_xapian can find the right Xapian database" if not environment
# check for a config file
- config_file = Rails.root.to_s + "/config/xapian.yml"
+ config_file = Rails.root.join("config","xapian.yml")
@@config = File.exists?(config_file) ? YAML.load_file(config_file)[environment] : {}
# figure out where the DBs should go
if config['base_db_path']
- db_parent_path = RAILS_ROOT + "/" + config['base_db_path']
+ db_parent_path = Rails.root.join(config['base_db_path'])
else
db_parent_path = File.join(File.dirname(__FILE__), '../xapiandbs/')
end