Permalink
Browse files

Merge remote branch 'edwinmoss/master'

  • Loading branch information...
tekin committed Dec 8, 2009
2 parents fbac0a6 + 05551ba commit cb5b45e1dec56f4b1c8dbe77a78aba6863116524
Showing with 1 addition and 2 deletions.
  1. +0 −1 init.rb
  2. +1 −1 lib/file_column_helper.rb
View
@@ -6,7 +6,6 @@
require 'file_compat'
require 'file_column_helper'
require 'validations'
-require 'test_case'
ActiveRecord::Base.send(:include, FileColumn)
ActionView::Base.send(:include, FileColumnHelper)
@@ -76,7 +76,7 @@ def url_for_file_column(object, method, options=nil)
return nil unless relative_path
url = ""
- url << request.relative_url_root.to_s if absolute
+ url << ActionController::Base.relative_url_root.to_s if absolute
url << "/"
url << object.send("#{method}_options")[:base_url] << "/"
url << relative_path

0 comments on commit cb5b45e

Please sign in to comment.