diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-01-17 12:46:51 +1100 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-01-17 12:46:51 +1100 |
| commit | 6f663addaa7ed40f1133687d7a2be0958bf0c059 (patch) | |
| tree | 7beb7f092c1979d1fd5ea6e7aaaf4f59c2f4abf4 /actionpack/lib/action_controller/metal/compatibility.rb | |
| parent | 8834b2612b7ddda70ee6a685eb0063d3daa8e63d (diff) | |
| parent | 3e94032227d450d479f511070c51f37f53d0ecc4 (diff) | |
| download | rails-6f663addaa7ed40f1133687d7a2be0958bf0c059.tar.gz rails-6f663addaa7ed40f1133687d7a2be0958bf0c059.tar.bz2 rails-6f663addaa7ed40f1133687d7a2be0958bf0c059.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_controller/metal/compatibility.rb')
| -rw-r--r-- | actionpack/lib/action_controller/metal/compatibility.rb | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb index a90f798cd5..0e869e4e87 100644 --- a/actionpack/lib/action_controller/metal/compatibility.rb +++ b/actionpack/lib/action_controller/metal/compatibility.rb @@ -21,6 +21,8 @@ module ActionController class << self delegate :default_charset=, :to => "ActionDispatch::Response" + delegate :resources_path_names, :to => "ActionController::Routing::Routes" + delegate :resources_path_names=, :to => "ActionController::Routing::Routes" end # cattr_reader :protected_instance_variables @@ -29,15 +31,7 @@ module ActionController @variables_added @request_origin @url @parent_controller @action_name @before_filter_chain_aborted @_headers @_params - @_flash @_response) - - # Indicates whether or not optimise the generated named - # route helper methods - cattr_accessor :optimise_named_routes - self.optimise_named_routes = true - - cattr_accessor :resources_path_names - self.resources_path_names = { :new => 'new', :edit => 'edit' } + @_response) # Controls the resource action separator cattr_accessor :resource_action_separator |