Permalink
Browse files

Fix up messed up merge

  • Loading branch information...
1 parent 213f315 commit e8577991dcc47bcb11f99fd6582ee2a3f8270498 @NZKoz NZKoz committed Sep 23, 2008
Showing with 13 additions and 5 deletions.
  1. +13 −5 activesupport/lib/active_support/core_ext/rexml.rb
@@ -19,11 +19,19 @@ def unnormalized
end
end
- def record_entity_expansion!
- @number_of_expansions ||= 0
- @number_of_expansions += 1
- if @number_of_expansions > @@entity_expansion_limit
- raise "Number of entity expansions exceeded, processing aborted."
+ class Document < Element
+
+ @@entity_expansion_limit = 10_000
+ def self.entity_expansion_limit= val
+ @@entity_expansion_limit = val
+ end
+
+ def record_entity_expansion!
+ @number_of_expansions ||= 0
+ @number_of_expansions += 1
+ if @number_of_expansions > @@entity_expansion_limit
+ raise "Number of entity expansions exceeded, processing aborted."
+ end
end
end
end

0 comments on commit e857799

Please sign in to comment.