aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/engine.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2010-10-15 16:31:00 +0200
committerXavier Noria <fxn@hashref.com>2010-10-15 16:31:00 +0200
commit21ff8849bb7d4f1c277d767c7704eb63d8920cc7 (patch)
tree5e6b8d278ef14d0ab0089238bbce61bad5423b32 /railties/lib/rails/engine.rb
parentc42ea2172eb977538cda076942d69eb90e090a26 (diff)
downloadrails-21ff8849bb7d4f1c277d767c7704eb63d8920cc7.tar.gz
rails-21ff8849bb7d4f1c277d767c7704eb63d8920cc7.tar.bz2
rails-21ff8849bb7d4f1c277d767c7704eb63d8920cc7.zip
in regexps, the dot in a character class is not a metacharacter
Diffstat (limited to 'railties/lib/rails/engine.rb')
-rw-r--r--railties/lib/rails/engine.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 25ca8c4758..5fb9cc1825 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -336,7 +336,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