diff --git a/core/modules/node/node.admin.inc b/core/modules/node/node.admin.inc index b59d58bb978eb834427e4fad79e1297a0406b627..83acc3cad536222df06aa3cf73466496633c16f1 100644 --- a/core/modules/node/node.admin.inc +++ b/core/modules/node/node.admin.inc @@ -242,12 +242,7 @@ function node_filter_form_submit($form, &$form_state) { // Apply every filter that has a choice selected other than 'any'. foreach ($filters as $filter => $options) { if (isset($form_state['values'][$filter]) && $form_state['values'][$filter] != '[any]') { - // Flatten the options array to accommodate hierarchical/nested options. - $flat_options = form_options_flatten($filters[$filter]['options']); - // Only accept valid selections offered on the dropdown, block bad input. - if (isset($flat_options[$form_state['values'][$filter]])) { - $_SESSION['node_overview_filter'][] = array($filter, $form_state['values'][$filter]); - } + $_SESSION['node_overview_filter'][] = array($filter, $form_state['values'][$filter]); } } break; diff --git a/core/modules/user/user.admin.inc b/core/modules/user/user.admin.inc index 4789e7e73131b627a85dcc1e3a30b1815f1cbaf8..f7d4552b2f8dc0cc28d0bf888f9f7681b8ed2d6d 100644 --- a/core/modules/user/user.admin.inc +++ b/core/modules/user/user.admin.inc @@ -115,12 +115,7 @@ function user_filter_form_submit($form, &$form_state) { // Apply every filter that has a choice selected other than 'any'. foreach ($filters as $filter => $options) { if (isset($form_state['values'][$filter]) && $form_state['values'][$filter] != '[any]') { - // Merge an array of arrays into one if necessary. - $options = ($filter == 'permission') ? form_options_flatten($filters[$filter]['options']) : $filters[$filter]['options']; - // Only accept valid selections offered on the dropdown, block bad input. - if (isset($options[$form_state['values'][$filter]])) { - $_SESSION['user_overview_filter'][] = array($filter, $form_state['values'][$filter]); - } + $_SESSION['user_overview_filter'][] = array($filter, $form_state['values'][$filter]); } } break;