rails / rails fork watch download tarball
public
Description: Ruby on Rails
Homepage: http://rubyonrails.org
Clone URL: git://github.com/rails/rails.git
Search Repo: 
 r3465@asus:  jeremy | 2005-12-13 10:15:33 -0800
 Apply [3298] to stable.  Don't used defined? on a scoped constant since 
 it results in a const_missing call.


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@3299 
5ecf4fe2-1ee6-0310-87b1-e25e094e27de
jeremy (author)
Tue Dec 13 10:37:32 -0800 2005
commit  e8c7d7af4809d7179a4797d5f73512c0632a2586
tree    a679e1101fd5374bef2805b77deb0b78b3b0809b
parent  cad37c3eafe0244d210809cf3285b0f5e09bdcb7
0
actionpack/lib/action_controller/caching.rb 
...
514
515
516
517
518
 
 
519
520
521
 
...
514
515
516
 
 
517
518
519
520
521
 
0
@@ -514,8 +514,8 @@ module ActionController #:nodoc:
0
         end
0
       end
0
     end
0
-    
0
-    if defined?(ActiveRecord::Observer)
0
+
0
+    if defined?(ActiveRecord) and defined?(ActiveRecord::Observer)
0
       class Sweeper < ActiveRecord::Observer #:nodoc:
0
         attr_accessor :controller
0
         

Comments

    No one has commented yet.