summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcatch2011-11-30 11:13:33 +0900
committercatch2011-11-30 11:13:33 +0900
commit782b1cfb07b982f1450e43b326f5f5b4785d3e4f (patch)
tree076720a321ab4376fcfa91828a46eae8678fa399
parent9988cc614fcc97ff15e678593b29ade0db1fe7bc (diff)
Issue #1315008 by bfroehle: Remove unnecessary validation in user/node list filtering.
-rw-r--r--core/modules/node/node.admin.inc7
-rw-r--r--core/modules/user/user.admin.inc7
2 files changed, 2 insertions, 12 deletions
diff --git a/core/modules/node/node.admin.inc b/core/modules/node/node.admin.inc
index b59d58b..83acc3c 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 4789e7e..f7d4552 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;