From 3376ec12884d53ad0108c76491dc4018e820225f Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Fri, 21 Dec 2012 09:54:22 +0100 Subject: [PATCH] Keep compatibility with 7.1 thus not unicode compliant --- .../core/notification/cms_external_mailer.e | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/draft/application/cms/src/core/notification/cms_external_mailer.e b/draft/application/cms/src/core/notification/cms_external_mailer.e index 0f81db7d..c2324b5f 100644 --- a/draft/application/cms/src/core/notification/cms_external_mailer.e +++ b/draft/application/cms/src/core/notification/cms_external_mailer.e @@ -78,15 +78,24 @@ feature -- Basic operation process_email (a_email: CMS_EMAIL) local + proc_args: detachable ARRAYED_LIST [STRING_8] l_factory: PROCESS_FACTORY args: like arguments p: detachable PROCESS retried: INTEGER do if retried = 0 then + if attached arguments as l_args then + create proc_args.make (l_args.count) + across + l_args as c + loop + proc_args.force (c.item) + end + end create l_factory if stdin_mode_set then - p := l_factory.process_launcher (executable_path, arguments, Void) + p := l_factory.process_launcher (executable_path, proc_args, Void) p.set_hidden (True) p.set_separate_console (False) @@ -99,18 +108,16 @@ feature -- Basic operation end end else - if attached arguments as l_args then - args := l_args.twin - else + if proc_args = Void then if attached {RAW_FILE} new_temporary_file (generator) as f then f.create_read_write f.put_string (a_email.message) f.close - create args.make (1) - args.force (f.name) + create proc_args.make (1) + proc_args.force (f.name) end end - p := l_factory.process_launcher (executable_path, args, Void) + p := l_factory.process_launcher (executable_path, proc_args, Void) p.set_hidden (True) p.set_separate_console (False)