Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 3873

Show
Ignore:
Timestamp:
03/15/06 15:12:24 (2 years ago)
Author:
minam
Message:

Fix Mime::Type#to_sym to do @string.to_sym. Add text/yaml as alias for Mime::YAML

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/actionpack/lib/action_controller/mime_type.rb

    r3852 r3873  
    4343     
    4444    def to_sym 
    45       @symbol || to_sym 
     45      @symbol || @string.to_sym 
    4646    end 
    4747 
     
    6565  RSS   = Type.new "application/rss+xml", :rss 
    6666  ATOM  = Type.new "application/atom+xml", :atom 
    67   YAML  = Type.new "application/x-yaml", :yaml 
     67  YAML  = Type.new "application/x-yaml", :yaml, %w( text/yaml ) 
    6868 
    6969  LOOKUP = Hash.new { |h, k| h[k] = Type.new(k) } 
     
    8282  LOOKUP["application/x-javascript"] = JS 
    8383 
     84  LOOKUP["text/yaml"]                = YAML 
     85  LOOKUP["application/x-yaml"]       = YAML 
     86 
    8487  LOOKUP["application/rss+xml"]      = RSS 
    8588  LOOKUP["application/atom+xml"]     = ATOM 
    86   LOOKUP["application/x-yaml"]       = YAML 
    8789end