Upgrade to Rails 2.0.2

Upgraded to Rails 2.0.2, except that we maintain

   vendor/rails/actionpack/lib/action_controller/routing.rb

from Rail 1.2.6 (at least for now), so that Routes don't change. We still
get to enjoy Rails's many new features.

Also fixed a bug in Chunk-handling: disable WikiWord processing in tags (for real this time).

vendor/rails/actionpack/lib/action_controller/flash.rb

@@ -1,8 +1,8 @@
 module ActionController #:nodoc:
   # The flash provides a way to pass temporary objects between actions. Anything you place in the flash will be exposed
-  # to the very next action and then cleared out. This is a great way of doing notices and alerts, such as a create action
-  # that sets <tt>flash[:notice] = "Successfully created"</tt> before redirecting to a display action that can then expose 
-  # the flash to its template. Actually, that exposure is automatically done. Example:
+  # to the very next action and then cleared out. This is a great way of doing notices and alerts, such as a create
+  # action that sets <tt>flash[:notice] = "Successfully created"</tt> before redirecting to a display action that can
+  # then expose the flash to its template. Actually, that exposure is automatically done. Example:
   #
   #   class WeblogController < ActionController::Base
   #     def create
@@ -16,18 +16,17 @@ module ActionController #:nodoc:
   #     end
   #   end
   #
-  #   display.rhtml
+  #   display.erb
   #     <% if flash[:notice] %><div class="notice"><%= flash[:notice] %></div><% end %>
   #
-  # This example just places a string in the flash, but you can put any object in there. And of course, you can put as many
-  # as you like at a time too. Just remember: They'll be gone by the time the next action has been performed.
+  # This example just places a string in the flash, but you can put any object in there. And of course, you can put as
+  # many as you like at a time too. Just remember: They'll be gone by the time the next action has been performed.
   #
   # See docs on the FlashHash class for more details about the flash.
   module Flash
     def self.included(base)
-      base.send :include, InstanceMethods
-
       base.class_eval do
+        include InstanceMethods
         alias_method_chain :assign_shortcuts, :flash
         alias_method_chain :process_cleanup,  :flash
         alias_method_chain :reset_session,    :flash
@@ -63,7 +62,7 @@ module ActionController #:nodoc:
       end
       
       def update(h) #:nodoc:
-        h.keys.each{ |k| discard(k) }
+        h.keys.each { |k| keep(k) }
         super
       end
       
@@ -85,7 +84,7 @@ module ActionController #:nodoc:
       #
       # Entries set via <tt>now</tt> are accessed the same way as standard entries: <tt>flash['my-key']</tt>.
       def now
-        FlashNow.new self
+        FlashNow.new(self)
       end
     
       # Keeps either the entire current flash or a specific flash entry available for the next action:
@@ -96,10 +95,10 @@ module ActionController #:nodoc:
         use(k, false)
       end
     
-      # Marks the entire flash or a single flash entry to be discarded by the end of the current action
+      # Marks the entire flash or a single flash entry to be discarded by the end of the current action:
       #
-      #     flash.keep                 # keep entire flash available for the next action
-      #     flash.discard(:warning)    # discard the "warning" entry (it'll still be available for the current action)
+      #     flash.discard              # discard the entire flash at the end of the current action
+      #     flash.discard(:warning)    # discard only the "warning" entry at the end of the current action
       def discard(k = nil)
         use(k)
       end
@@ -117,7 +116,8 @@ module ActionController #:nodoc:
           end
         end
 
-        (@used.keys - keys).each{|k| @used.delete k } # clean up after keys that could have been left over by calling reject! or shift on the flash
+        # clean up after keys that could have been left over by calling reject! or shift on the flash
+        (@used.keys - keys).each{ |k| @used.delete(k) }
       end
     
       private
@@ -130,29 +130,19 @@ module ActionController #:nodoc:
           unless k.nil?
             @used[k] = v
           else
-            keys.each{|key| use key, v }
+            keys.each{ |key| use(key, v) }
           end
         end
     end
 
     module InstanceMethods #:nodoc:
-      def assign_shortcuts_with_flash(request, response) #:nodoc:
-        assign_shortcuts_without_flash(request, response)
-        flash(:refresh)
-      end
+      protected
+        def reset_session_with_flash
+          reset_session_without_flash
+          remove_instance_variable(:@_flash)
+          flash(:refresh)
+        end
       
-      def process_cleanup_with_flash
-        flash.sweep if @_session
-        process_cleanup_without_flash
-      end
-
-      def reset_session_with_flash
-        reset_session_without_flash
-        remove_instance_variable(:@_flash)
-        flash(:refresh)
-      end
-      
-      protected 
         # Access the contents of the flash. Use <tt>flash["notice"]</tt> to read a notice you put there or 
         # <tt>flash["notice"] = "hello"</tt> to put a new one.
         # Note that if sessions are disabled only flash.now will work.
@@ -172,10 +162,15 @@ module ActionController #:nodoc:
           @_flash
         end
 
-        # deprecated. use <tt>flash.keep</tt> instead
-        def keep_flash #:doc:
-          ActiveSupport::Deprecation.warn 'keep_flash is deprecated; use flash.keep instead.', caller
-          flash.keep
+      private
+        def assign_shortcuts_with_flash(request, response) #:nodoc:
+          assign_shortcuts_without_flash(request, response)
+          flash(:refresh)
+        end
+    
+        def process_cleanup_with_flash
+          flash.sweep if @_session
+          process_cleanup_without_flash
         end
     end
   end