Changeset 5413

Timestamp:

11/02/06 19:32:16 (2 years ago)

Author:

bitsweat

Message:

Merge [5412] from trunk.

Files:

• branches/1-2-pre-release/actionpack/CHANGELOG (modified) (1 diff)
• branches/1-2-pre-release/actionpack/lib/action_controller/caching.rb (modified) (1 diff)

branches/1-2-pre-release/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Deprecate expire_matched_fragments. Use expire_fragment instead.  #6535 [Bob Silva]
-
-* Update to latest Prototype, which doesn't serialize disabled form elements, adds clone() to arrays, empty/non-string Element.update() and adds a fixes excessive error reporting in WebKit beta versions [Thomas Fuchs]

branches/1-2-pre-release/actionpack/lib/action_controller/caching.rb

@@ -390 +390 @@
-        expire_fragment(matcher, options)
-      end
+      deprecate :expire_matched_fragments => :expire_fragment
-
-