Merge branch 'master' into svn

git-svn-id: https://tdiary.svn.sourceforge.net/svnroot/tdiary/trunk/core@3640 7f22e88f-374d-0410-998f-c91420d97ba2
tdiary · Jun 20, 2010 · 742815e · 742815e
2 parents 3030da4 + b1485a8
commit 742815e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/misc/plugin/image.rb b/misc/plugin/image.rb
@@ -186,7 +186,8 @@ def image_list( date )
 	list = []
 	reg = /#{date}_(\d+)\.(#{image_ext})$/
 	begin
-		Dir::foreach( @image_dir ) do |file|
+		Dir::glob( @image_dir + "/#{date}_*" ) do |file|
+			file = File.basename( file )
 			list[$1.to_i] = file if reg =~ file
 		end
 	rescue Errno::ENOENT