diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-03-13 16:21:41 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-03-14 12:46:23 -0300 |
| commit | 4c16791f355c74f8e6ad916e67fd4ae81efbf708 (patch) | |
| tree | 4d0bac9dddd90c1b7ffaea3f309e79c0b7468154 /actionpack/lib/action_controller/metal/force_ssl.rb | |
| parent | cc1c4acc8eeee4287627b1d184d7d04a22eddb27 (diff) | |
| download | rails-4c16791f355c74f8e6ad916e67fd4ae81efbf708.tar.gz rails-4c16791f355c74f8e6ad916e67fd4ae81efbf708.tar.bz2 rails-4c16791f355c74f8e6ad916e67fd4ae81efbf708.zip | |
Add ActionController::HTTP
More info http://edgeguides.rubyonrails.org/api_app.html
[Carlos Antonio da Silva & Santiago Pastorino]
Diffstat (limited to 'actionpack/lib/action_controller/metal/force_ssl.rb')
| -rw-r--r-- | actionpack/lib/action_controller/metal/force_ssl.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/force_ssl.rb b/actionpack/lib/action_controller/metal/force_ssl.rb index a1e40fc4e0..ac12cbb625 100644 --- a/actionpack/lib/action_controller/metal/force_ssl.rb +++ b/actionpack/lib/action_controller/metal/force_ssl.rb @@ -44,7 +44,7 @@ module ActionController redirect_options = {:protocol => 'https://', :status => :moved_permanently} redirect_options.merge!(:host => host) if host redirect_options.merge!(:params => request.query_parameters) - flash.keep + flash.keep if respond_to?(:flash) redirect_to redirect_options end end |