summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormakoto kuwata <kwa@kuwata-lab.com>2007-07-11 20:07:03 +0000
committermakoto kuwata <kwa@kuwata-lab.com>2007-07-11 20:07:03 +0000
commit0738cda7c6e297ae725f015d915e8e35b33ffaf4 (patch)
treee70b5dbae672de6e6701535fa32b8dd68e50f662
parent6195125b3afbbd103ac16fa72320a2345a765c60 (diff)
downloaderubis-0738cda7c6e297ae725f015d915e8e35b33ffaf4.tar.gz
- [bugfix] main.rb: Object#hash() was returned instead of context in load_datafile()
-rw-r--r--ChangeLog.txt5
-rw-r--r--lib/erubis/main.rb2
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index a6f8fda..7baf36d 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -2,9 +2,12 @@
.?lastupdate: $Date$
.?version: $Rev$
+
+: Rev.88 (2007-07-12)
+ .- [bugfix] main.rb: Object#hash() was returned instead of context in load_datafile()
+
: Rev.87 (2007-07-12)
.- [bugfix] main.rb: help message was not displayed
- .- [bugfix] main.rb: Object#hash() was returned instead of context in load_datafile()
: Rev.86 (2007-05-26)
.- [bugfix] preprocessor bug is found in rails_helper.rb
diff --git a/lib/erubis/main.rb b/lib/erubis/main.rb
index 44b5a05..6e38e39 100644
--- a/lib/erubis/main.rb
+++ b/lib/erubis/main.rb
@@ -406,7 +406,7 @@ module Erubis
def load_datafiles(filenames, opts)
context = Erubis::Context.new
- return hash unless filenames
+ return context unless filenames
filenames.split(/,/).each do |filename|
filename.strip!
test(?f, filename) or raise CommandOptionError.new("#{filename}: file not found.")