summaryrefslogtreecommitdiff
path: root/lib/erb.rb
diff options
context:
space:
mode:
authorseki <seki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-02-28 02:00:37 +0000
committerseki <seki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-02-28 02:00:37 +0000
commit8f7e8231806a29d06f6965469fb0f13ee051cd02 (patch)
tree7694f16ac831b527a870d0072e6b2a53ea5321e3 /lib/erb.rb
parent97756449c46b74890a2545b78322a49e73918b95 (diff)
* 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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@5848 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 4e3aaf4a86..44529bf325 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