diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-02-27 17:10:04 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-02-27 17:10:04 -0800 |
| commit | b1b922d6ea96bca0d0406032b02b1cd4b6e7f6c7 (patch) | |
| tree | cc68864101cd8630c3bf9b0d115d753c264d0556 /railties/lib | |
| parent | 6189480b1878cdadb092fdfa32ba156a91e6a0e1 (diff) | |
| download | rails-b1b922d6ea96bca0d0406032b02b1cd4b6e7f6c7.tar.gz rails-b1b922d6ea96bca0d0406032b02b1cd4b6e7f6c7.tar.bz2 rails-b1b922d6ea96bca0d0406032b02b1cd4b6e7f6c7.zip | |
Revert "Revert "Application detection should also allow dots in the path.""
Works after all. Culprit was 226dfc2.
This reverts commit 6189480b1878cdadb092fdfa32ba156a91e6a0e1.
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/engine.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb index a259edc826..b6ac48768d 100644 --- a/railties/lib/rails/engine.rb +++ b/railties/lib/rails/engine.rb @@ -17,7 +17,7 @@ module Rails base.called_from = begin # Remove the line number from backtraces making sure we don't leave anything behind call_stack = caller.map { |p| p.split(':')[0..-2].join(':') } - File.dirname(call_stack.detect { |p| p !~ %r[railties[\w\-]*/lib/rails|rack[\w\-]*/lib/rack] }) + File.dirname(call_stack.detect { |p| p !~ %r[railties[\w\-\.]*/lib/rails|rack[\w\-\.]*/lib/rack] }) end end |