Merge commit 'tarmo/2-1-stable' into upgrade

rails · Aug 25, 2008 · f477676 · f477676
2 parents 11d9669 + 0528758
commit f477676
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/activerecord/lib/active_record/named_scope.rb b/activerecord/lib/active_record/named_scope.rb
@@ -103,7 +103,7 @@ class Scope
       attr_reader :proxy_scope, :proxy_options
 
       [].methods.each do |m|
-        unless m =~ /(^__|^nil\?|^send|^object_id$|class|extend|^find€|count|sum|average|maximum|minimum|paginate|first|last|empty?|respond_to?)/
+        unless m =~ /(^__|^nil\?|^send|^object_id$|class|extend|^find$|count|sum|average|maximum|minimum|paginate|first|last|empty?|respond_to?)/
           delegate m, :to => :proxy_found
         end
       end