diff options
| author | seki <seki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-02-28 02:00:37 +0000 |
|---|---|---|
| committer | seki <seki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-02-28 02:00:37 +0000 |
| commit | b824a9c756d89234b90ccaf47514d4f673f2dcde (patch) | |
| tree | 7694f16ac831b527a870d0072e6b2a53ea5321e3 | |
| parent | 4ce5b6d5b9fc9df1387cb88fbd7a1a84dbb31c21 (diff) | |
| download | ruby-b824a9c756d89234b90ccaf47514d4f673f2dcde.tar.gz ruby-b824a9c756d89234b90ccaf47514d4f673f2dcde.tar.xz ruby-b824a9c756d89234b90ccaf47514d4f673f2dcde.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/branches/ruby_1_8@5848 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | MANIFEST | 1 | ||||
| -rw-r--r-- | lib/erb.rb | 2 |
3 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Sat Feb 28 10:58:49 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp> + + * 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 <m_seki@mva.biglobe.ne.jp> * lib/drb/drb.rb, test/drb/drbtest.rb: require drb/eq.rb by default @@ -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 |