Index: webform.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/webform.module,v
retrieving revision 1.196.2.36
diff -u -r1.196.2.36 webform.module
--- webform.module	20 Jun 2010 17:50:28 -0000	1.196.2.36
+++ webform.module	21 Jun 2010 04:26:02 -0000
@@ -1399,7 +1399,7 @@
     foreach ($component_tree['children'] as $cid => $component) {
       $component_value = isset($form_state['values']['submitted'][$component['form_key']]) ? $form_state['values']['submitted'][$component['form_key']] : NULL;
       if (_webform_client_form_rule_check($node, $component, $page_num, $form_state)) {
-        _webform_client_form_add_component($component, $component_value, $form['submitted'], $form, $submission, 'form', $page_num, $filter);
+        _webform_client_form_add_component($node, $component, $component_value, $form['submitted'], $form, $form_state, $submission, 'form', $page_num, $filter);
       }
     }
 
@@ -1584,7 +1584,7 @@
  * @see webform_client_form
  * @see webform_submission_render
  */
-function _webform_client_form_add_component($component, $component_value, &$parent_fieldset, &$form, $submission, $format = 'form', $page_num = 0, $filter = TRUE) {
+function _webform_client_form_add_component($node, $component, $component_value, &$parent_fieldset, &$form, $form_state, $submission, $format = 'form', $page_num = 0, $filter = TRUE) {
   $cid = $component['cid'];
 
   // Load with submission information if necessary.
@@ -1638,7 +1638,9 @@
   if (isset($component['children']) && is_array($component['children'])) {
     foreach ($component['children'] as $scid => $subcomponent) {
       $subcomponent_value = isset($component_value[$subcomponent['form_key']]) ? $component_value[$subcomponent['form_key']] : NULL;
-      _webform_client_form_add_component($subcomponent, $subcomponent_value, $parent_fieldset[$component['form_key']], $form, $submission, $format, $page_num, $filter);
+      if (_webform_client_form_rule_check($node, $subcomponent, $page_num, $form_state, $submission)) {
+        _webform_client_form_add_component($node, $subcomponent, $subcomponent_value, $parent_fieldset[$component['form_key']], $form, $form_state, $submission, $format, $page_num, $filter);
+      }
     }
   }
 }
Index: includes/webform.submissions.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/includes/webform.submissions.inc,v
retrieving revision 1.18.2.7
diff -u -r1.18.2.7 webform.submissions.inc
--- includes/webform.submissions.inc	18 Jun 2010 04:14:28 -0000	1.18.2.7
+++ includes/webform.submissions.inc	21 Jun 2010 04:26:02 -0000
@@ -234,7 +234,7 @@
   // Recursively add components to the form.
   foreach ($component_tree['children'] as $cid => $component) {
     if (!in_array($cid, $excluded_components) && _webform_client_form_rule_check($node, $component, $component['page_num'], NULL, $submission)) {
-      _webform_client_form_add_component($component, NULL, $renderable, $renderable, $submission, $format);
+      _webform_client_form_add_component($node, $component, NULL, $renderable, $renderable, NULL, $submission, $format);
     }
   }