From b824a9c756d89234b90ccaf47514d4f673f2dcde Mon Sep 17 00:00:00 2001 From: seki Date: Sat, 28 Feb 2004 02:00:37 +0000 Subject: * 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/branches/ruby_1_8@5848 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ MANIFEST | 1 + lib/erb.rb | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index cf97953c3..8c6f482fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sat Feb 28 10:58:49 2004 Masatoshi SEKI + + * 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] + Fri Feb 27 01:00:09 2004 Masatoshi SEKI * lib/drb/drb.rb, test/drb/drbtest.rb: require drb/eq.rb by default diff --git a/MANIFEST b/MANIFEST index 52fc272f3..a22544a69 100644 --- a/MANIFEST +++ b/MANIFEST @@ -746,6 +746,7 @@ test/drb/ut_large.rb test/drb/ut_port.rb test/drb/ut_safe1.rb test/drb/ut_timerholder.rb +test/erb/test_erb.rb test/fileutils/fileasserts.rb test/fileutils/test_fileutils.rb test/fileutils/test_nowrite.rb 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 -- cgit