From 0db158e57b5c1f4a2552b5c8cabe329d61f8db0d Mon Sep 17 00:00:00 2001 From: Michael J Rubinsky Date: Fri, 29 Jul 2016 11:42:25 -0400 Subject: [PATCH] Bug: 14397 Cannot specify the 'h' flag when using an action block. --- ingo/lib/Script/Procmail/Recipe.php | 2 +- ingo/test/Ingo/Unit/ProcmailTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ingo/lib/Script/Procmail/Recipe.php b/ingo/lib/Script/Procmail/Recipe.php index 04557ece93c..ac1c32ac940 100644 --- a/ingo/lib/Script/Procmail/Recipe.php +++ b/ingo/lib/Script/Procmail/Recipe.php @@ -182,7 +182,7 @@ public function __construct($params = array(), $scriptparams = array()) $this->_action[] = ' SUBJECT=| formail -xSubject:'; $this->_action[] = ''; $this->_action[] = - ' :0 Whc: ${VACATION_DIR:-.}/vacation.lock'; + ' :0 Wc: ${VACATION_DIR:-.}/vacation.lock'; if ($timed) { $this->_action[] = ' * ? test $DATE -gt $START && test $END -gt $DATE'; diff --git a/ingo/test/Ingo/Unit/ProcmailTest.php b/ingo/test/Ingo/Unit/ProcmailTest.php index f741538f14f..7f2efba55ba 100644 --- a/ingo/test/Ingo/Unit/ProcmailTest.php +++ b/ingo/test/Ingo/Unit/ProcmailTest.php @@ -180,7 +180,7 @@ public function testVacationEnabled() DUMMY=`test -f ${VACATION_DIR:-.}/\'.vacation.from@example.com\' && test $FILEDATE -le $DATE && rm ${VACATION_DIR:-.}/\'.vacation.from@example.com\'` :0 h SUBJECT=| formail -xSubject: -:0 Whc: ${VACATION_DIR:-.}/vacation.lock +:0 Wc: ${VACATION_DIR:-.}/vacation.lock { :0 Wh * ^TO_from@example.com