summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/managesieve/Changelog2
-rw-r--r--plugins/managesieve/lib/rcube_sieve.php4
2 files changed, 6 insertions, 0 deletions
diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog
index 8c5a90456..feb84748c 100644
--- a/plugins/managesieve/Changelog
+++ b/plugins/managesieve/Changelog
@@ -1,3 +1,5 @@
+- Fixed import from Avelsieve
+
* version 2.9 [2010-08-02]
-----------------------------------------------------------
- Fixed vacation parameters parsing (#1486883)
diff --git a/plugins/managesieve/lib/rcube_sieve.php b/plugins/managesieve/lib/rcube_sieve.php
index 7c397254a..926e8a7e0 100644
--- a/plugins/managesieve/lib/rcube_sieve.php
+++ b/plugins/managesieve/lib/rcube_sieve.php
@@ -339,6 +339,10 @@ class rcube_sieve
$content .= "# rule:[".$name[$i]."]\n";
}
elseif (isset($name[$i])) {
+ // This preg_replace is added because I've found some Avelsieve scripts
+ // with rules containing "if" here. I'm not sure it was working
+ // before without this or not.
+ $token = preg_replace('/^if\s+/', '', trim($token));
$content .= "if $token\n";
$i++;
}