aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-03-01 02:04:54 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-03-01 02:04:54 +0000
commit28a11969ced52abf3d7d51f486779cf31d1efe1f (patch)
tree34ab22fda9a57519727956778f5be585115a917f /actionpack/lib
parenta29625fc801482229948155e8735cb163ded3916 (diff)
downloadrails-28a11969ced52abf3d7d51f486779cf31d1efe1f.tar.gz
rails-28a11969ced52abf3d7d51f486779cf31d1efe1f.tar.bz2
rails-28a11969ced52abf3d7d51f486779cf31d1efe1f.zip
Fix request.path_info and clear up LoadingModule behavior #754 [Nicholas Seckar]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@817 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
-rwxr-xr-xactionpack/lib/action_controller/request.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb
index 16117a6079..75b7c62378 100755
--- a/actionpack/lib/action_controller/request.rb
+++ b/actionpack/lib/action_controller/request.rb
@@ -78,7 +78,7 @@ module ActionController
end
def path_info
- env['PATH_INFO']
+ (/^(.*)\.html$/ =~ env['PATH_INFO']) ? $1 : env['PATH_INFO']
end
def protocol