Merge branch 'master' of github.com:roundcube/roundcubemail

4 files changed, 8 insertions, 4 deletions

diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog
index 115aec14f..b7b9ecf68 100644
--- a/plugins/managesieve/Changelog
+++ b/plugins/managesieve/Changelog
@@ -1,8 +1,11 @@
+* version 7.1 [2013-11-22]
+-----------------------------------------------------------
 - lib/Net Sieve.php moved to Roundcube /lib directory
 - Added managesieve_domains option to limit redirect destinations
 - Fix bug where at least one additional address of vacation message was required (#1489345)
 - Fix so i;ascii-numeric comparator is not forced as default for :count and :value operators
 - Fix date/currentdate related form issues and comparators handling (#1489346)
+- Fix a bug where deleted filter was not removed from the list
 
 * version 7.0 [2013-09-09]
 -----------------------------------------------------------
diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
index 6c9f8048a..e0f6ead9a 100644
--- a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
+++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
@@ -53,7 +53,7 @@ class rcube_sieve_engine
         "x-beenthere",
     );
 
-    const VERSION  = '7.0';
+    const VERSION  = '7.1';
     const PROGNAME = 'Roundcube (Managesieve)';
     const PORT     = 4190;
 
diff --git a/plugins/managesieve/managesieve.js b/plugins/managesieve/managesieve.js
index fa13b7125..22a50ba4d 100644
--- a/plugins/managesieve/managesieve.js
+++ b/plugins/managesieve/managesieve.js
@@ -161,7 +161,7 @@ rcube_webmail.prototype.managesieve_rowid = function(id)
 {
   var i, rows = this.filters_list.rows;
 
-  for (i=0; i<rows.length; i++)
+  for (i in rows)
     if (rows[i] != null && rows[i].uid == id)
       return i;
 };
diff --git a/program/js/list.js b/program/js/list.js
index 4ae6c0c66..6f54dd77c 100644
--- a/program/js/list.js
+++ b/program/js/list.js
@@ -91,8 +91,7 @@ init: function()
     var r, len, rows = this.tbody.childNodes;
 
     for (r=0, len=rows.length; r<len; r++) {
-      this.init_row(rows[r]);
-      this.rowcount++;
+      this.rowcount += this.init_row(rows[r]) ? 1 : 0;
     }
 
     this.init_header();
@@ -148,6 +147,8 @@ init_row: function(row)
 
     this.row_init(this.rows[uid]);  // legacy support
     this.triggerEvent('initrow', this.rows[uid]);
+
+    return true;
   }
 },