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

4 files changed, 8 insertions, 16 deletions

diff --git a/installer/config.php b/installer/config.php
index b9a051ba0..4fcf5b08e 100644
--- a/installer/config.php
+++ b/installer/config.php
@@ -15,7 +15,6 @@ $RCI->load_defaults();
 // register these boolean fields
 $RCI->bool_config_props = array(
   'ip_check' => 1,
-  'enable_caching' => 1,
   'enable_spellcheck' => 1,
   'auto_create_user' => 1,
   'smtp_log' => 1,
@@ -127,16 +126,6 @@ echo $check_ipcheck->show(intval($RCI->getprop('ip_check')), array('value' => 1)
 <p class="hint">This increases security but can cause sudden logouts when someone uses a proxy with changing IPs.</p>
 </dd>
 
-<dt class="propname">enable_caching</dt>
-<dd>
-<?php
-
-$check_caching = new html_checkbox(array('name' => '_enable_caching', 'id' => "cfgcache"));
-echo $check_caching->show(intval($RCI->getprop('enable_caching')), array('value' => 1));
-
-?>
-<label for="cfgcache">Cache messages in local database</label><br />
-</dd>
 
 <dt class="propname">enable_spellcheck</dt>
 <dd>
diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index 63c164124..c95d936d2 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -456,7 +456,8 @@ class rcube_install
         '0.6-beta', '0.6',
         '0.7-beta', '0.7', '0.7.1', '0.7.2', '0.7.3', '0.7.4',
         '0.8-beta', '0.8-rc', '0.8.0', '0.8.1', '0.8.2', '0.8.3', '0.8.4', '0.8.5', '0.8.6',
-        '0.9-beta', '0.9-rc', '0.9-rc2', '0.9.0', '0.9.1', '0.9.2',
+        '0.9-beta', '0.9-rc', '0.9-rc2',
+        // Note: Do not add newer versions here
     ));
     return $select;
   }
diff --git a/plugins/managesieve/managesieve.js b/plugins/managesieve/managesieve.js
index a1f31bb25..3a87a9f43 100644
--- a/plugins/managesieve/managesieve.js
+++ b/plugins/managesieve/managesieve.js
@@ -603,10 +603,12 @@ function rule_header_select(id)
 
 function rule_op_select(obj, id, header)
 {
-  var target = document.getElementById('rule_target' + id + '_list'),
-    style = obj.value == 'exists' || obj.value == 'notexists' || header == 'size' ? 'none' : 'inline-block';
+  var target = document.getElementById('rule_target' + id + '_list');
 
-  target.style.display = style;
+  if (!header)
+    header = document.getElementById('header' + id).value;
+
+  target.style.display = obj.value == 'exists' || obj.value == 'notexists' || header == 'size' ? 'none' : 'inline-block';
 };
 
 function rule_trans_select(id)
diff --git a/plugins/managesieve/managesieve.php b/plugins/managesieve/managesieve.php
index 63ca97a70..0dfe05a6f 100644
--- a/plugins/managesieve/managesieve.php
+++ b/plugins/managesieve/managesieve.php
@@ -1353,7 +1353,7 @@ class managesieve extends rcube_plugin
         $select_op = new html_select(array('name' => "_rule_op[]", 'id' => 'rule_op'.$id,
             'style' => 'display:' .($rule['test']!='size' ? 'inline' : 'none'),
             'class' => 'operator_selector',
-            'onchange' => 'rule_op_select('.$id.')'));
+            'onchange' => 'rule_op_select(this, '.$id.')'));
         $select_op->add(rcube::Q($this->gettext('filtercontains')), 'contains');
         $select_op->add(rcube::Q($this->gettext('filternotcontains')), 'notcontains');
         $select_op->add(rcube::Q($this->gettext('filteris')), 'is');