summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorseki <seki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-23 16:27:20 +0000
committerseki <seki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-23 16:27:20 +0000
commitd22a07baa8a4eaaf6ebdbe1e8ce8acd9429603da (patch)
tree3cea58f805ebf3d4fb8cf3bffea5822d7ac493c5 /lib
parenta4c6fb81bbf3871bd2954de30499e4c3a378f5ea (diff)
use proc instead of Thread. [ruby-dev:33692]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@15829 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/erb.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/erb.rb b/lib/erb.rb
index 951c3b4107..3cfbc11c30 100644
--- a/lib/erb.rb
+++ b/lib/erb.rb
@@ -729,13 +729,12 @@ class ERB
#
def result(b=TOPLEVEL_BINDING)
if @safe_level
- th = Thread.start {
+ proc {
$SAFE = @safe_level
eval(@src, b, (@filename || '(erb)'), 1)
- }
- return th.value
+ }.call
else
- return eval(@src, b, (@filename || '(erb)'), 1)
+ eval(@src, b, (@filename || '(erb)'), 1)
end
end