summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorkazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-27 08:48:24 +0000
committerkazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-27 08:48:24 +0000
commit26950a4a1281816f799d8ba221b193560327b2d4 (patch)
tree401611e7580030f0d78c8a9276f397e41c2f81e7 /lib
parent50082cbba7c4b84e370283ad49bcaae2d9523851 (diff)
downloadruby-26950a4a1281816f799d8ba221b193560327b2d4.tar.gz
ruby-26950a4a1281816f799d8ba221b193560327b2d4.tar.xz
ruby-26950a4a1281816f799d8ba221b193560327b2d4.zip
* lib/erb.rb: adjust line number for magic comment.
* test/erb/test_erb.rb: add tests for def_method. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@17610 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/erb.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/erb.rb b/lib/erb.rb
index d48d00ac3..c87994128 100644
--- a/lib/erb.rb
+++ b/lib/erb.rb
@@ -736,16 +736,16 @@ class ERB
if @safe_level
th = Thread.start {
$SAFE = @safe_level
- eval(@src, b, (@filename || '(erb)'), 1)
+ eval(@src, b, (@filename || '(erb)'), 0)
}
return th.value
else
- return eval(@src, b, (@filename || '(erb)'), 1)
+ return eval(@src, b, (@filename || '(erb)'), 0)
end
end
def def_method(mod, methodname, fname='(ERB)') # :nodoc:
- mod.module_eval("def #{methodname}\n" + self.src + "\nend\n", fname, 0)
+ mod.module_eval("def #{methodname}\n" + self.src + "\nend\n", fname, -1)
end
def def_module(methodname='erb') # :nodoc: