summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/db.inc.php.dist10
-rw-r--r--plugins/managesieve/Changelog1
-rw-r--r--plugins/managesieve/managesieve.js2
3 files changed, 5 insertions, 8 deletions
diff --git a/config/db.inc.php.dist b/config/db.inc.php.dist
index 49ec245ad..a596d647d 100644
--- a/config/db.inc.php.dist
+++ b/config/db.inc.php.dist
@@ -5,7 +5,7 @@
| Configuration file for database access |
| |
| This file is part of the Roundcube Webmail client |
- | Copyright (C) 2005-2009, The Roundcube Dev Team |
+ | Copyright (C) 2005-2012, The Roundcube Dev Team |
| |
| Licensed under the GNU General Public License version 3 or |
| any later version with exceptions for skins & plugins. |
@@ -31,15 +31,11 @@ $rcmail_config['db_dsnw'] = 'mysql://roundcube:pass@localhost/roundcubemail';
// useful for database replication
$rcmail_config['db_dsnr'] = '';
-// maximum length of a query in bytes
-$rcmail_config['db_max_length'] = 512000; // 500K
-
// use persistent db-connections
// beware this will not "always" work as expected
// see: http://www.php.net/manual/en/features.persistent-connections.php
$rcmail_config['db_persistent'] = FALSE;
-
// you can define specific table names used to store webmail data
$rcmail_config['db_table_users'] = 'users';
$rcmail_config['db_table_identities'] = 'identities';
@@ -51,7 +47,8 @@ $rcmail_config['db_table_cache'] = 'cache';
$rcmail_config['db_table_cache_index'] = 'cache_index';
$rcmail_config['db_table_cache_thread'] = 'cache_thread';
$rcmail_config['db_table_cache_messages'] = 'cache_messages';
-
+$rcmail_config['db_table_dictionary'] = 'dictionary';
+$rcmail_config['db_table_searches'] = 'searches';
// you can define specific sequence names used in PostgreSQL
$rcmail_config['db_sequence_users'] = 'user_ids';
@@ -62,4 +59,3 @@ $rcmail_config['db_sequence_searches'] = 'search_ids';
// end db config file
-
diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog
index 4b839a8b2..6baaa0499 100644
--- a/plugins/managesieve/Changelog
+++ b/plugins/managesieve/Changelog
@@ -1,5 +1,6 @@
- Fixed filter activation/deactivation confirmation message (#1488765)
- Moved rcube_* classes to <plugin>/lib/Roundcube for compat. with Roundcube Framework autoloader
+- Fixed filter selection after filter deletion (#1488832)
* version 6.0 [2012-10-03]
-----------------------------------------------------------
diff --git a/plugins/managesieve/managesieve.js b/plugins/managesieve/managesieve.js
index bbc10793c..6bf99ac26 100644
--- a/plugins/managesieve/managesieve.js
+++ b/plugins/managesieve/managesieve.js
@@ -373,7 +373,7 @@ rcube_webmail.prototype.load_managesieveframe = function(id)
target = window.frames[this.env.contentframe];
var msgid = this.set_busy(true, 'loading');
target.location.href = this.env.comm_path+'&_action=plugin.managesieve&_framed=1'
- +(id ? '&_fid='+id : '')+'&_unlock='+msgid;
+ +(has_id ? '&_fid='+id : '')+'&_unlock='+msgid;
}
};