diff options
| author | Yehuda Katz <wycats@gmail.com> | 2009-01-30 11:30:27 -0800 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2009-01-30 11:30:27 -0800 |
| commit | 3030bc90c95e335d726f06fd7a61ed96055e9109 (patch) | |
| tree | 5b079250b368f0e8af6d2f72a4278fdab3382b26 /actionpack/lib/action_controller/cgi/ext.rb | |
| parent | ae42163bf5497849e4fcbb736505910c17640459 (diff) | |
| parent | 85750f22c90c914a429116fb908990c5a2c68379 (diff) | |
| download | rails-3030bc90c95e335d726f06fd7a61ed96055e9109.tar.gz rails-3030bc90c95e335d726f06fd7a61ed96055e9109.tar.bz2 rails-3030bc90c95e335d726f06fd7a61ed96055e9109.zip | |
Merge commit 'rails/3-0-unstable'
Conflicts:
actionpack/lib/action_controller/base.rb
actionpack/lib/action_dispatch/http/mime_type.rb
actionpack/lib/action_dispatch/http/request.rb
actionpack/lib/action_view/base.rb
actionpack/lib/action_view/paths.rb
actionpack/test/controller/session/cookie_store_test.rb
actionpack/test/dispatch/rack_test.rb
actionpack/test/dispatch/request_test.rb
Diffstat (limited to 'actionpack/lib/action_controller/cgi/ext.rb')
| -rw-r--r-- | actionpack/lib/action_controller/cgi/ext.rb | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/cgi/ext.rb b/actionpack/lib/action_controller/cgi/ext.rb new file mode 100644 index 0000000000..558748f4bd --- /dev/null +++ b/actionpack/lib/action_controller/cgi/ext.rb @@ -0,0 +1,15 @@ +require 'action_controller/cgi/ext/stdinput' +require 'action_controller/cgi/ext/query_extension' +require 'action_controller/cgi/ext/cookie' + +class CGI #:nodoc: + include ActionController::CgiExt::Stdinput + + class << self + alias :escapeHTML_fail_on_nil :escapeHTML + + def escapeHTML(string) + escapeHTML_fail_on_nil(string) unless string.nil? + end + end +end |