Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix Rails 1.9 defined? error

  • Loading branch information...
commit 450e22ff1c419ad8b0250b6adefae5951f1ce5ed 1 parent b7718f7
@kscjake kscjake authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 lib/dm-paperclip/storage.rb
View
4 lib/dm-paperclip/storage.rb
@@ -174,7 +174,7 @@ def s3_host_alias
def parse_credentials creds
creds = find_credentials(creds).to_mash.stringify_keys!
- if defined? Merb && Merb.respond_to?(:env)
+ if Object.const_defined?('Merb') && Merb.respond_to?(:env)
(creds[Merb.env] || creds).symbolize_keys
elsif defined? RAILS_ENV
(creds[RAILS_ENV] || creds).symbolize_keys
@@ -254,4 +254,4 @@ def find_credentials creds
end
end
-end
+end
Please sign in to comment.
Something went wrong with that request. Please try again.