Rails.root is Pathname, it's behavior is different

in 2.2.2 acts as string in edge no :)
kfl62 · Feb 7, 2009 · 96b9908 · 96b9908
1 parent 0d126a8
commit 96b9908
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -4,10 +4,10 @@
 class ApplicationController < ActionController::Base
   helper :all # include all helpers, all the time
 
-  #before_filter :current_database
+  before_filter :current_database
 
   filter_parameter_logging :password, :password_confirmation
-  helper_method :current_trst_user_session, :current_trst_user, :current_title, :current_logo
+  helper_method :current_trst_user_session, :current_trst_user, :current_title, :current_logo,:current_location, :database_string
 
 
   private
@@ -61,9 +61,9 @@ def current_location
   end
 
   def database_string
-    FileTest.exists?(Rails.root + '/db/' + current_location + '.sqlite3') ?
-      Rails.root + '/db/' + current_location + '.sqlite3' :
-      Rails.root + '/db/development.sqlite3'
+    FileTest.exists?(File.join(Rails.root,"db","#{current_location}.sqlite3")) ?
+      File.join(Rails.root,"db","#{current_location}.sqlite3"):
+      File.join(Rails.root,"db/development.sqlite3")
   end
 
   def current_database