Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

This commit is contained in:
Jacques Distler 2009-07-14 00:02:07 -05:00
commit d474cb83ad

View file

@ -46,7 +46,7 @@ module MaRuKu; module Strings
# #
def parse_email_headers(s) def parse_email_headers(s)
keys={} keys={}
match = (s =~ /\A((\w[\w\s\_\-]+: .*\n)+)\s*\n/) match = (s =~ /\A((\w[\w \t\_\-]+: .*?\n)+)\s*?\n/)
if match != 0 if match != 0
keys[:data] = s keys[:data] = s
else else