Skip to content

Commit

Permalink
Fixes the Merb.orm issue
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel Neighman committed Sep 1, 2008
1 parent 97f720b commit 2bbcb51
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/merb-auth/initializer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def self.adapters
# @param [Symbol | String] adapter The name of the adapter to load. This must be registered
# @raise [RuntimeError] Raises an error if the adapter is not registered.
def self.load_adapter!(adapter = nil)
adapter ||= self.config[:adapter] || Merb.orm
adapter ||= self.config[:adapter] || Merb.orm_generator_scope
raise "MerbAuth: No Adapter Specified" if adapter.nil? || adapter.blank?

# Check that the adapter is registered
Expand Down

0 comments on commit 2bbcb51

Please sign in to comment.