From b2545a4d146b99eb9a8400cfd6d617b76dc13c55 Mon Sep 17 00:00:00 2001
From: seki <seki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 22 Apr 2003 16:29:47 +0000
Subject: fix ERB::DefMethod bug

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@3715 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/erb.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/erb.rb b/lib/erb.rb
index 62ce1977d..9d6dc9dfd 100644
--- a/lib/erb.rb
+++ b/lib/erb.rb
@@ -277,8 +277,10 @@ class ERB
       if erb.kind_of? String
 	fname = erb
 	File.open(fname) {|f| erb = ERB.new(f.read) }
+	erb.def_method(self, methodname, fname)
+      else
+	erb.def_method(self, methodname)
       end
-      erb.def_method(self, methodname, fname)
     end
     module_function :def_erb_method
   end
-- 
cgit 


<td class='logo' rowspan='2'><a href='/cgit/'><img src='/cgit-data/cgit.png' alt='cgit logo'/></a></td>
<td class='main'><a href='/cgit/'>index</a> : <a title='ansible.git' href='/cgit/qwan/public_git/ansible.git/'>ansible.git</a></td><td class='form'><form method='get'>
<input type='hidden' name='id' value='966dd586c65173189ac618c8a70695d374370565'/><select name='h' onchange='this.form.submit();'>
<option value='master' selected='selected'>master</option>
<option value='odcs'>odcs</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Unnamed repository; edit this file 'description' to name the repository.</td><td class='sub right'>Qixiang Wan</td></tr></table>
<table class='tabs'><tr><td>
<a href='/cgit/qwan/public_git/ansible.git/'>summary</a><a href='/cgit/qwan/public_git/ansible.git/refs/?id=966dd586c65173189ac618c8a70695d374370565'>refs</a><a href='/cgit/qwan/public_git/ansible.git/log/.gitignore'>log</a><a class='active' href='/cgit/qwan/public_git/ansible.git/tree/.gitignore?id=966dd586c65173189ac618c8a70695d374370565'>tree</a><a href='/cgit/qwan/public_git/ansible.git/commit/.gitignore?id=966dd586c65173189ac618c8a70695d374370565'>commit</a><a href='/cgit/qwan/public_git/ansible.git/diff/.gitignore?id=966dd586c65173189ac618c8a70695d374370565'>diff</a><a href='/cgit/qwan/public_git/ansible.git/stats/.gitignore'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit/qwan/public_git/ansible.git/log/.gitignore'>
<input type='hidden' name='id' value='966dd586c65173189ac618c8a70695d374370565'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/cgit/qwan/public_git/ansible.git/tree/?id=966dd586c65173189ac618c8a70695d374370565'>root</a>/<a href='/cgit/qwan/public_git/ansible.git/tree/.gitignore?id=966dd586c65173189ac618c8a70695d374370565'>.gitignore</a></div><div class='content'>blob: b94898552f738567566d1b31b1b67895491613b2 (<a href='/cgit/qwan/public_git/ansible.git/plain/.gitignore?id=966dd586c65173189ac618c8a70695d374370565'>plain</a>)
<table summary='blob content' class='blob'>
<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
<a id='n2' href='#n2'>2</a>
</pre></td>
<td class='lines'><pre><code>