summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--MANIFEST1
-rw-r--r--lib/erb.rb2
3 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cf97953c35..8c6f482fc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/MANIFEST b/MANIFEST
index 52fc272f3b..a22544a690 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 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