summaryrefslogtreecommitdiffstats
path: root/lib/erb.rb
diff options
context:
space:
mode:
authorseki <seki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-02-28 01:52:14 +0000
committerseki <seki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-02-28 01:52:14 +0000
commit35a2c2c5da651fbb512d64e5fa5275df6d084455 (patch)
treed02f78ce6aefc30b32e2977a141d70fbecf7a24a /lib/erb.rb
parent5ec61453c5012088ee9719925ad1937a0bc61102 (diff)
downloadruby-35a2c2c5da651fbb512d64e5fa5275df6d084455.tar.gz
ruby-35a2c2c5da651fbb512d64e5fa5275df6d084455.tar.xz
ruby-35a2c2c5da651fbb512d64e5fa5275df6d084455.zip
* MANIFEST: add test_erb.rb
* lib/erb.rb, test/erb/test_erb.rb: don't forget filename, if both filename and safe_level given. [ruby-dev:23050] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5846 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/erb.rb')
-rw-r--r--lib/erb.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/erb.rb b/lib/erb.rb
index 4e3aaf4a8..44529bf32 100644
--- a/lib/erb.rb
+++ b/lib/erb.rb
@@ -414,7 +414,7 @@ class ERB
if @safe_level
th = Thread.start {
$SAFE = @safe_level
- eval(@src, b)
+ eval(@src, b, (@filename || '(erb)'), 1)
}
return th.value
else