Update README

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4307 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

Update README
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4307 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
0049bd72 · Marcel Molina · c745f478 · 0049bd72 · 0049bd72
隐藏空白更改
内联并排

Showing with 23 addition and 21 deletion

actionpack/README actionpack/README +5 -5

actionpack/lib/action_controller/base.rb actionpack/lib/action_controller/base.rb +18 -16

未找到文件。
--- a/actionpack/README
+++ b/actionpack/README
@@ -139,7 +139,7 @@ A short rundown of the major features:
    end
    Layout file (called weblog_layout):
-      <html><body><%= @content_for_layout %></body></html>
+      <html><body><%= yield %></body></html>
    Template for hello_world action:
      <h1>Hello world</h1>
@@ -155,7 +155,7 @@ A short rundown of the major features:
    map.connect 'clients/:client_name/:project_name/:controller/:action'
    Accessing /clients/37signals/basecamp/project/dash calls ProjectController#dash with
-    { "client_name" => "37signals", "project_name" => "basecamp" } in @params["params"]
+    { "client_name" => "37signals", "project_name" => "basecamp" } in params[:params]
    From that URL, you can rewrite the redirect in a number of ways:
@@ -338,7 +338,7 @@ A short rundown of the major features:
      <input type="submit" value="Create">
    </form>
-    This form generates a @params["post"] array that can be used directly in a save action:
+    This form generates a params[:post] array that can be used directly in a save action:
    class WeblogController < ActionController::Base
      def save
@@ -370,7 +370,7 @@ methods:
    end
    def display
-      @post = Post.find(:params[:id])
+      @post = Post.find(params[:id])
    end
    def new
@@ -394,7 +394,7 @@ And the templates look like this:
  weblog/layout.rhtml:
    <html><body>
-    <%= @content_for_layout %>
+    <%= yield %>
    </body></html>
  weblog/index.rhtml:

--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -373,24 +373,26 @@ def hide_action(*names)
      def filter_parameter_logging(*filter_words, &block)
        parameter_filter = Regexp.new(filter_words.collect{ |s| s.to_s }.join('|'), true) if filter_words.length > 0
-        define_method(:filter_parameters) do |unfiltered_parameters|
+        class << self
-          filtered_parameters = {}
+          define_method(:filter_parameters) do |unfiltered_parameters|
+            filtered_parameters = {}
-          unfiltered_parameters.each do |key, value|
-            if key =~ parameter_filter
+            unfiltered_parameters.each do |key, value|
-              filtered_parameters[key] = '[FILTERED]'
+              if key =~ parameter_filter
-            elsif value.is_a?(Hash)
+                filtered_parameters[key] = '[FILTERED]'
-              filtered_parameters[key] = filter_parameters(value) 
+              elsif value.is_a?(Hash)
-            elsif block_given?
+                filtered_parameters[key] = filter_parameters(value) 
-              key, value = key.dup, value.dup
+              elsif block_given?
-              yield key, value
+                key, value = key.dup, value.dup
-              filtered_parameters[key] = value
+                yield key, value
-            else 
+                filtered_parameters[key] = value
-              filtered_parameters[key] = value
+              else 
+                filtered_parameters[key] = value
+              end
            end
-          end
-          filtered_parameters
+            filtered_parameters
+          end
        end
      end
    end