convert prohibited relative to absolute paths

emiddleton · Jul 31, 2009 · c99a2d8 · c99a2d8
1 parent 35995a5
commit c99a2d8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/app/models/theme.rb b/app/models/theme.rb
@@ -10,11 +10,11 @@ def initialize(name, path)
 
   def layout(action=:default)
     if action.to_s == 'view_page'
-      if File.exists? "../../themes/#{name}/layouts/pages.html.erb"
-        return "../../themes/#{name}/layouts/pages.html.erb"
+      if File.exists? "#{RAILS_ROOT}/themes/#{name}/layouts/pages.html.erb"
+        return "#{RAILS_ROOT}/themes/#{name}/layouts/pages.html.erb"
       end
     end
-    "../../themes/#{name}/layouts/default.html.erb"
+    "#{RAILS_ROOT}/themes/#{name}/layouts/default.html.erb"
   end
 
   def description

diff --git a/spec/models/theme_spec.rb b/spec/models/theme_spec.rb
@@ -5,8 +5,8 @@
     @theme = Theme.new("test", "test")
   end
 
-  it 'layout path should be "../../themes/test/layouts/default.html.erb"'  do
-    @theme.layout('index').should == "../../themes/test/layouts/default.html.erb"
+  it 'layout path should be "#{RAILS_ROOT}/themes/test/layouts/default.html.erb"'  do
+    @theme.layout('index').should == "#{RAILS_ROOT}/themes/test/layouts/default.html.erb"
   end  
 end