From: Jan Schneider <jan@horde.org>
Date: Wed, 30 Dec 2009 23:21:26 +0000 (+0100)
Subject: MFB: Remove stray slash (Bug #8804).
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=7d76106c3960377c978520367292805c234e4fb1;p=horde.git

MFB: Remove stray slash (Bug #8804).
---

diff --git a/ingo/docs/CHANGES b/ingo/docs/CHANGES
index 9e4dbc935..f8817ffdd 100644
--- a/ingo/docs/CHANGES
+++ b/ingo/docs/CHANGES
@@ -10,6 +10,7 @@ v2.0-git
 v1.2.4-cvs
 ----------
 
+[jan] Fix procmail scripts when using composite headers (Bug #8804).
 [jan] Support some non-standard Date: headers in Sieve vacation rules
       (Request #8783).
 [jan] Support composite header rules with IMAP backends (Request #7343).
diff --git a/ingo/lib/Script/Procmail.php b/ingo/lib/Script/Procmail.php
index e062054f1..c1c821663 100644
--- a/ingo/lib/Script/Procmail.php
+++ b/ingo/lib/Script/Procmail.php
@@ -633,10 +633,10 @@ class Procmail_Recipe {
 
         default:
             // convert 'field' to PCRE pattern matching
-            if (strpos($condition['field'], ',') == false) {
+            if (!strpos($condition['field'], ',')) {
                 $string = '^' . $condition['field'] . ':';
             } else {
-                $string .= '/^(' . str_replace(',', '|', $condition['field']) . '):';
+                $string .= '^(' . str_replace(',', '|', $condition['field']) . '):';
             }
             $prefix = ' ';
         }