From 8d3a9d3213c34b9114762f748b48a71854eaa0bc Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Fri, 22 Nov 2013 03:25:43 -0500
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
program/js/list.js | 5 +++--
plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php | 2 +-
plugins/managesieve/Changelog | 3 +++
plugins/managesieve/managesieve.js | 2 +-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog
index 115aec1..b7b9ecf 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 6c9f804..e0f6ead 100644
--- a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
+++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
@@ -53,7 +53,7 @@
"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 fa13b71..22a50ba 100644
--- a/plugins/managesieve/managesieve.js
+++ b/plugins/managesieve/managesieve.js
@@ -161,7 +161,7 @@
{
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 4ae6c0c..6f54dd7 100644
--- a/program/js/list.js
+++ b/program/js/list.js
@@ -91,8 +91,7 @@
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 @@
this.row_init(this.rows[uid]); // legacy support
this.triggerEvent('initrow', this.rows[uid]);
+
+ return true;
}
},
--
Gitblit v1.9.1