summaryrefslogtreecommitdiff
path: root/plugins/managesieve
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2012-01-05 08:50:07 +0000
committeralecpl <alec@alec.pl>2012-01-05 08:50:07 +0000
commita33118fd0f0fa3765507b50bcb45cf44da1190bb (patch)
tree04ad1aa53b40c411051570d2bb9df2261bf78aed /plugins/managesieve
parent896b2204e85aafb7eece9e42a0fb4e3bf5a8551b (diff)
- Applied fixes from trunk up to r5711
Diffstat (limited to 'plugins/managesieve')
-rw-r--r--plugins/managesieve/Changelog1
-rw-r--r--plugins/managesieve/managesieve.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog
index 05506120e..f59859d9a 100644
--- a/plugins/managesieve/Changelog
+++ b/plugins/managesieve/Changelog
@@ -1,5 +1,6 @@
- Fixed setting test type to :is when none is specified
- Fixed javascript error in IE8
+- Fix possible ID duplication when adding filter rules very fast (#1488288)
* version 5.0-rc1 [2011-11-17]
-----------------------------------------------------------
diff --git a/plugins/managesieve/managesieve.php b/plugins/managesieve/managesieve.php
index 5ac406ade..283f7ceb4 100644
--- a/plugins/managesieve/managesieve.php
+++ b/plugins/managesieve/managesieve.php
@@ -1542,7 +1542,7 @@ class managesieve extends rcube_plugin
private function genid()
{
- $result = intval(rcube_timer());
+ $result = preg_replace('/[^0-9]/', '', microtime(true));
return $result;
}