Changeset 1243

Show
Ignore:
Timestamp:
01/09/08 18:39:02 (9 months ago)
Author:
wayneesegu..@gmail.com
Message:

Updated merb_{sequel,dm,ar} to use BootLoader?.app_loaded? instead of Server.app_loaded?

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/merb_activerecord/lib/merb_activerecord.rb

    r880 r1243  
    11# make sure we're running inside Merb 
    22if defined?(Merb::Plugins) 
    3   if Merb::Server.app_loaded? 
     3  if Merb::BootLoader.app_loaded? 
    44    puts "Warning: The merb_active_record gem must be loaded before the application" 
    55  else 

  • plugins/merb_datamapper/lib/merb_datamapper.rb

    r1048 r1243  
    11# make sure we're running inside Merb 
    22if defined?(Merb::Plugins) 
    3   if Merb::Server.app_loaded? 
     3  if Merb::BootLoader.app_loaded? 
    44    puts "Warning: The merb_datamapper gem must be loaded before the application" 
    55  else 

  • plugins/merb_sequel/lib/merb_sequel.rb

    r657 r1243  
    11# make sure we're running inside Merb 
    22if defined?(Merb::Plugins) 
    3   if Merb::Server.app_loaded? 
     3  if Merb::BootLoader.app_loaded? 
    44    puts "Warning: The merb_sequel gem must be loaded before the application" 
    55  else