From 0738cda7c6e297ae725f015d915e8e35b33ffaf4 Mon Sep 17 00:00:00 2001
From: makoto kuwata <kwa@kuwata-lab.com>
Date: Wed, 11 Jul 2007 20:07:03 +0000
Subject: - [bugfix] main.rb: Object#hash() was returned instead of context in
 load_datafile()

---
 ChangeLog.txt      | 5 ++++-
 lib/erubis/main.rb | 2 +-
 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.")
-- 
cgit v1.2.1