Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1

Marius Burkard · Marius Burkard · commit d8526220aa68 · 2017-08-07T16:42:24.000+02:00
diff --git a/server/conf/sieve_filter.master b/server/conf/sieve_filter.master
@@ -32,7 +32,7 @@ if header :contains "X-Spam-Flag" "YES" {
   stop;
 }
 vacation  :days 1
-  :subject "Out of office reply"
+  :subject "<tmpl_var name='autoresponder_subject'>"
   # :addresses ["test@test.int", "till@test.int"]
   <tmpl_var name='addresses'>
   "<tmpl_var name='autoresponder_text'>";

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ if header :contains "X-Spam-Flag" "YES" {`
`32`	`32`	`stop;`
`33`	`33`	`}`
`34`	`34`	`vacation :days 1`
`35`		`- :subject "Out of office reply"`
	`35`	`+ :subject "<tmpl_var name='autoresponder_subject'>"`
`36`	`36`	`# :addresses ["test@test.int", "till@test.int"]`
`37`	`37`	`<tmpl_var name='addresses'>`
`38`	`38`	`"<tmpl_var name='autoresponder_text'>";`